Page MenuHome
Differential D3855 Diff 14647 source/blender/blenloader/intern/readfile.c

Changeset View

Standalone View

View Options

source/blender/blenloader/intern/readfile.c

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 5,352 Lines • ▼ Show 20 Lines// >>> XXX deprecated - old animation system
if (fluidmd && fluidmd->fss) if (fluidmd && fluidmd->fss)
fluidmd->fss->ipo = newlibadr_us(fd, ob->id.lib, fluidmd->fss->ipo); // XXX deprecated - old animation system fluidmd->fss->ipo = newlibadr_us(fd, ob->id.lib, fluidmd->fss->ipo); // XXX deprecated - old animation system
} }
{ {
SmokeModifierData *smd = (SmokeModifierData *)modifiers_findByType(ob, eModifierType_Smoke); SmokeModifierData *smd = (SmokeModifierData *)modifiers_findByType(ob, eModifierType_Smoke);
if (smd && (smd->type == MOD_SMOKE_TYPE_DOMAIN) && smd->domain) { if (smd && (smd->type == MOD_SMOKE_TYPE_DOMAIN) && smd->domain) {
smd->domain->flags |= MOD_SMOKE_FILE_LOAD; /* flag for refreshing the simulation after loading */ smd->domain->flags |= FLUID_DOMAIN_FILE_LOAD; /* flag for refreshing the simulation after loading */
} }
} }
/* texture field */ /* texture field */
if (ob->pd) if (ob->pd)
lib_link_partdeflect(fd, &ob->id, ob->pd); lib_link_partdeflect(fd, &ob->id, ob->pd);
if (ob->soft) { if (ob->soft) {
▲ Show 20 Lines • Show All 149 Lines • ▼ Show 20 Lines else if (md->type == eModifierType_Fluidsim) {
fluidmd->fss->meshVelocities = NULL; fluidmd->fss->meshVelocities = NULL;
} }
} }
else if (md->type == eModifierType_Smoke) { else if (md->type == eModifierType_Smoke) {
SmokeModifierData *smd = (SmokeModifierData *)md; SmokeModifierData *smd = (SmokeModifierData *)md;
if (smd->type == MOD_SMOKE_TYPE_DOMAIN) { if (smd->type == MOD_SMOKE_TYPE_DOMAIN) {
smd->flow = NULL; smd->flow = NULL;
smd->coll = NULL; smd->effec = NULL;
smd->domain = newdataadr(fd, smd->domain); smd->domain = newdataadr(fd, smd->domain);
smd->domain->smd = smd; smd->domain->smd = smd;
smd->domain->fluid = NULL; smd->domain->fluid = NULL;
smd->domain->fluid_mutex = BLI_rw_mutex_alloc(); smd->domain->fluid_mutex = BLI_rw_mutex_alloc();
smd->domain->wt = NULL;
smd->domain->shadow = NULL;
smd->domain->tex = NULL; smd->domain->tex = NULL;
smd->domain->tex_shadow = NULL; smd->domain->tex_shadow = NULL;
smd->domain->tex_flame = NULL; smd->domain->tex_flame = NULL;
smd->domain->tex_flame_coba = NULL; smd->domain->tex_flame_coba = NULL;
smd->domain->tex_coba = NULL; smd->domain->tex_coba = NULL;
smd->domain->tex_field = NULL; smd->domain->tex_field = NULL;
smd->domain->tex_velocity_x = NULL; smd->domain->tex_velocity_x = NULL;
smd->domain->tex_velocity_y = NULL; smd->domain->tex_velocity_y = NULL;
smd->domain->tex_velocity_z = NULL; smd->domain->tex_velocity_z = NULL;
smd->domain->tex_wt = NULL; smd->domain->tex_wt = NULL;
smd->domain->mesh_velocities = NULL;
smd->domain->coba = newdataadr(fd, smd->domain->coba); smd->domain->coba = newdataadr(fd, smd->domain->coba);
smd->domain->effector_weights = newdataadr(fd, smd->domain->effector_weights); smd->domain->effector_weights = newdataadr(fd, smd->domain->effector_weights);
if (!smd->domain->effector_weights) if (!smd->domain->effector_weights)
smd->domain->effector_weights = BKE_effector_add_weights(NULL); smd->domain->effector_weights = BKE_effector_add_weights(NULL);
direct_link_pointcache_list(fd, &(smd->domain->ptcaches[0]), &(smd->domain->point_cache[0]), 1); direct_link_pointcache_list(fd, &(smd->domain->ptcaches[0]), &(smd->domain->point_cache[0]), 1);
Show All 10 Lines else if (md->type == eModifierType_Smoke) {
BKE_ptcache_free(cache); BKE_ptcache_free(cache);
} }
BLI_listbase_clear(&smd->domain->ptcaches[1]); BLI_listbase_clear(&smd->domain->ptcaches[1]);
smd->domain->point_cache[1] = NULL; smd->domain->point_cache[1] = NULL;
} }
} }
else if (smd->type == MOD_SMOKE_TYPE_FLOW) { else if (smd->type == MOD_SMOKE_TYPE_FLOW) {
smd->domain = NULL; smd->domain = NULL;
smd->coll = NULL; smd->effec = NULL;
smd->flow = newdataadr(fd, smd->flow); smd->flow = newdataadr(fd, smd->flow);
smd->flow->smd = smd; smd->flow->smd = smd;
smd->flow->mesh = NULL; smd->flow->mesh = NULL;
smd->flow->verts_old = NULL; smd->flow->verts_old = NULL;
smd->flow->numverts = 0; smd->flow->numverts = 0;
smd->flow->psys = newdataadr(fd, smd->flow->psys); smd->flow->psys = newdataadr(fd, smd->flow->psys);
} }
else if (smd->type == MOD_SMOKE_TYPE_COLL) { else if (smd->type == MOD_SMOKE_TYPE_EFFEC) {
smd->flow = NULL; smd->flow = NULL;
smd->domain = NULL; smd->domain = NULL;
smd->coll = newdataadr(fd, smd->coll); smd->effec = newdataadr(fd, smd->effec);
if (smd->coll) { if (smd->effec) {
smd->coll->smd = smd; smd->effec->smd = smd;
smd->coll->verts_old = NULL; smd->effec->verts_old = NULL;
smd->coll->numverts = 0; smd->effec->numverts = 0;
smd->coll->mesh = NULL; smd->effec->mesh = NULL;
} }
else { else {
smd->type = 0; smd->type = 0;
smd->flow = NULL; smd->flow = NULL;
smd->domain = NULL; smd->domain = NULL;
smd->coll = NULL; smd->effec = NULL;
} }
} }
} }
else if (md->type == eModifierType_DynamicPaint) { else if (md->type == eModifierType_DynamicPaint) {
DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md; DynamicPaintModifierData *pmd = (DynamicPaintModifierData *)md;
if (pmd->canvas) { if (pmd->canvas) {
pmd->canvas = newdataadr(fd, pmd->canvas); pmd->canvas = newdataadr(fd, pmd->canvas);
▲ Show 20 Lines • Show All 5,954 Lines • Show Last 20 Lines