Page MenuHome
Differential D3855 Diff 20308 source/blender/blenloader/intern/versioning_260.c

Changeset View

Standalone View

View Options

source/blender/blenloader/intern/versioning_260.c

Show All 33 Lines
#include "DNA_mesh_types.h" #include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h" #include "DNA_meshdata_types.h"
#include "DNA_object_fluidsim_types.h" #include "DNA_object_fluidsim_types.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "DNA_text_types.h" #include "DNA_text_types.h"
#include "DNA_view3d_types.h" #include "DNA_view3d_types.h"
#include "DNA_screen_types.h" #include "DNA_screen_types.h"
#include "DNA_sdna_types.h" #include "DNA_sdna_types.h"
#include "DNA_smoke_types.h" #include "DNA_fluid_types.h"
#include "DNA_space_types.h" #include "DNA_space_types.h"
#include "DNA_world_types.h" #include "DNA_world_types.h"
#include "DNA_light_types.h" #include "DNA_light_types.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#include "BLI_blenlib.h" #include "BLI_blenlib.h"
#include "BLI_math.h" #include "BLI_math.h"
▲ Show 20 Lines • Show All 1,236 Lines • ▼ Show 20 Linesvoid blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
} }
if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 7)) { if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 7)) {
Object *ob; Object *ob;
for (ob = bmain->objects.first; ob; ob = ob->id.next) { for (ob = bmain->objects.first; ob; ob = ob->id.next) {
ModifierData *md; ModifierData *md;
for (md = ob->modifiers.first; md; md = md->next) { for (md = ob->modifiers.first; md; md = md->next) {
if (md->type == eModifierType_Smoke) { if (md->type == eModifierType_Fluid) {
SmokeModifierData *smd = (SmokeModifierData *)md; FluidModifierData *mmd = (FluidModifierData *)md;
if ((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) { if ((mmd->type & MOD_FLUID_TYPE_DOMAIN) && mmd->domain) {
int maxres = max_iii(smd->domain->res[0], smd->domain->res[1], smd->domain->res[2]); int maxres = max_iii(mmd->domain->res[0], mmd->domain->res[1], mmd->domain->res[2]);
smd->domain->scale = smd->domain->dx * maxres; mmd->domain->scale = mmd->domain->dx * maxres;
smd->domain->dx = 1.0f / smd->domain->scale; mmd->domain->dx = 1.0f / mmd->domain->scale;
} }
} }
} }
} }
} }
if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 9)) { if (bmain->versionfile < 263 || (bmain->versionfile == 263 && bmain->subversionfile < 9)) {
FOREACH_NODETREE_BEGIN (bmain, ntree, id) { FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
▲ Show 20 Lines • Show All 296 Lines • ▼ Show 20 Linesvoid blo_do_versions_260(FileData *fd, Library *UNUSED(lib), Main *bmain)
if (bmain->versionfile < 264 || (bmain->versionfile == 264 && bmain->subversionfile < 3)) { if (bmain->versionfile < 264 || (bmain->versionfile == 264 && bmain->subversionfile < 3)) {
/* smoke branch */ /* smoke branch */
{ {
Object *ob; Object *ob;
for (ob = bmain->objects.first; ob; ob = ob->id.next) { for (ob = bmain->objects.first; ob; ob = ob->id.next) {
ModifierData *md; ModifierData *md;
for (md = ob->modifiers.first; md; md = md->next) { for (md = ob->modifiers.first; md; md = md->next) {
if (md->type == eModifierType_Smoke) { if (md->type == eModifierType_Fluid) {
SmokeModifierData *smd = (SmokeModifierData *)md; FluidModifierData *mmd = (FluidModifierData *)md;
if ((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) { if ((mmd->type & MOD_FLUID_TYPE_DOMAIN) && mmd->domain) {
/* keep branch saves if possible */ /* keep branch saves if possible */
if (!smd->domain->flame_max_temp) { if (!mmd->domain->flame_max_temp) {
smd->domain->burning_rate = 0.75f; mmd->domain->burning_rate = 0.75f;
smd->domain->flame_smoke = 1.0f; mmd->domain->flame_smoke = 1.0f;
smd->domain->flame_vorticity = 0.5f; mmd->domain->flame_vorticity = 0.5f;
smd->domain->flame_ignition = 1.25f; mmd->domain->flame_ignition = 1.25f;
smd->domain->flame_max_temp = 1.75f; mmd->domain->flame_max_temp = 1.75f;
smd->domain->adapt_threshold = 0.02f; mmd->domain->adapt_threshold = 0.02f;
smd->domain->adapt_margin = 4; mmd->domain->adapt_margin = 4;
smd->domain->flame_smoke_color[0] = 0.7f; mmd->domain->flame_smoke_color[0] = 0.7f;
smd->domain->flame_smoke_color[1] = 0.7f; mmd->domain->flame_smoke_color[1] = 0.7f;
smd->domain->flame_smoke_color[2] = 0.7f; mmd->domain->flame_smoke_color[2] = 0.7f;
} }
} }
else if ((smd->type & MOD_SMOKE_TYPE_FLOW) && smd->flow) { else if ((mmd->type & MOD_FLUID_TYPE_FLOW) && mmd->flow) {
if (!smd->flow->texture_size) { if (!mmd->flow->texture_size) {
smd->flow->fuel_amount = 1.0; mmd->flow->fuel_amount = 1.0;
smd->flow->surface_distance = 1.5; mmd->flow->surface_distance = 1.5;
smd->flow->color[0] = 0.7f; mmd->flow->color[0] = 0.7f;
smd->flow->color[1] = 0.7f; mmd->flow->color[1] = 0.7f;
smd->flow->color[2] = 0.7f; mmd->flow->color[2] = 0.7f;
smd->flow->texture_size = 1.0f; mmd->flow->texture_size = 1.0f;
} }
} }
} }
} }
} }
} }
/* render border for viewport */ /* render border for viewport */
▲ Show 20 Lines • Show All 489 Lines • ▼ Show 20 Lines#endif
} }
if (MAIN_VERSION_OLDER(bmain, 267, 1)) { if (MAIN_VERSION_OLDER(bmain, 267, 1)) {
Object *ob; Object *ob;
for (ob = bmain->objects.first; ob; ob = ob->id.next) { for (ob = bmain->objects.first; ob; ob = ob->id.next) {
ModifierData *md; ModifierData *md;
for (md = ob->modifiers.first; md; md = md->next) { for (md = ob->modifiers.first; md; md = md->next) {
if (md->type == eModifierType_Smoke) { if (md->type == eModifierType_Fluid) {
SmokeModifierData *smd = (SmokeModifierData *)md; FluidModifierData *mmd = (FluidModifierData *)md;
if ((smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) { if ((mmd->type & MOD_FLUID_TYPE_DOMAIN) && mmd->domain) {
if (smd->domain->flags & MOD_SMOKE_HIGH_SMOOTH) { if (mmd->domain->flags & FLUID_DOMAIN_USE_HIGH_SMOOTH) {
smd->domain->highres_sampling = SM_HRES_LINEAR; mmd->domain->highres_sampling = SM_HRES_LINEAR;
} }
else { else {
smd->domain->highres_sampling = SM_HRES_NEAREST; mmd->domain->highres_sampling = SM_HRES_NEAREST;
} }
} }
} }
} }
} }
} }
if (!MAIN_VERSION_ATLEAST(bmain, 268, 1)) { if (!MAIN_VERSION_ATLEAST(bmain, 268, 1)) {
▲ Show 20 Lines • Show All 43 Lines • ▼ Show 20 Lines for (ob = bmain->objects.first; ob; ob = ob->id.next) {
data->projAxisSpace = CONSTRAINT_SPACE_LOCAL; data->projAxisSpace = CONSTRAINT_SPACE_LOCAL;
} }
} }
} }
for (ob = bmain->objects.first; ob; ob = ob->id.next) { for (ob = bmain->objects.first; ob; ob = ob->id.next) {
ModifierData *md; ModifierData *md;
for (md = ob->modifiers.first; md; md = md->next) { for (md = ob->modifiers.first; md; md = md->next) {
if (md->type == eModifierType_Smoke) { if (md->type == eModifierType_Fluid) {
SmokeModifierData *smd = (SmokeModifierData *)md; FluidModifierData *mmd = (FluidModifierData *)md;
if ((smd->type & MOD_SMOKE_TYPE_FLOW) && smd->flow) { if ((mmd->type & MOD_FLUID_TYPE_FLOW) && mmd->flow) {
if (!smd->flow->particle_size) { if (!mmd->flow->particle_size) {
smd->flow->particle_size = 1.0f; mmd->flow->particle_size = 1.0f;
} }
} }
} }
} }
} }
/* /*
* FIX some files have a zoom level of 0, and was checked during the drawing of the node space * FIX some files have a zoom level of 0, and was checked during the drawing of the node space
▲ Show 20 Lines • Show All 462 Lines • Show Last 20 Lines