diff options
Diffstat (limited to 'source/blender/modifiers/intern/MOD_smoke.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_smoke.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index 657c4e09d96..237d4cc6718 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -48,6 +48,7 @@ #include "BKE_cdderivedmesh.h" #include "BKE_library.h" +#include "BKE_library_query.h" #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_smoke.h" @@ -104,12 +105,11 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, ModifierApplyFlag flag) { SmokeModifierData *smd = (SmokeModifierData *) md; - bool for_render = (flag & MOD_APPLY_RENDER) != 0; if (flag & MOD_APPLY_ORCO) return dm; - return smokeModifier_do(smd, md->scene, ob, dm, for_render); + return smokeModifier_do(smd, md->scene, ob, dm); } static bool dependsOnTime(ModifierData *UNUSED(md)) @@ -122,10 +122,10 @@ static void update_depsgraph_flow_coll_object(DagForest *forest, Object *object2) { SmokeModifierData *smd; - if ((object2->id.flag & LIB_DOIT) == 0) { + if ((object2->id.tag & LIB_TAG_DOIT) == 0) { return; } - object2->id.flag &= ~LIB_DOIT; + object2->id.tag &= ~LIB_TAG_DOIT; smd = (SmokeModifierData *)modifiers_findByType(object2, eModifierType_Smoke); if (smd && (((smd->type & MOD_SMOKE_TYPE_FLOW) && smd->flow) || ((smd->type & MOD_SMOKE_TYPE_COLL) && smd->coll))) @@ -152,10 +152,10 @@ static void update_depsgraph_field_source_object(DagForest *forest, Object *object, Object *object2) { - if ((object2->id.flag & LIB_DOIT) == 0) { + if ((object2->id.tag & LIB_TAG_DOIT) == 0) { return; } - object2->id.flag &= ~LIB_DOIT; + object2->id.tag &= ~LIB_TAG_DOIT; if (object2->pd && object2->pd->forcefield == PFIELD_SMOKEFLOW && object2->pd->f_source == object) { DagNode *node2 = dag_get_node(forest, object2); dag_add_relation(forest, obNode, node2, DAG_RL_DATA_DATA | DAG_RL_OB_DATA, "Field Source Object"); @@ -213,7 +213,7 @@ static void updateDepgraph(ModifierData *md, DagForest *forest, } } else { - BKE_main_id_tag_listbase(&bmain->object, true); + BKE_main_id_tag_listbase(&bmain->object, LIB_TAG_DOIT, true); base = scene->base.first; for (; base; base = base->next) { update_depsgraph_flow_coll_object(forest, obNode, base->object); @@ -221,7 +221,7 @@ static void updateDepgraph(ModifierData *md, DagForest *forest, } /* add relation to all "smoke flow" force fields */ base = scene->base.first; - BKE_main_id_tag_listbase(&bmain->object, true); + BKE_main_id_tag_listbase(&bmain->object, LIB_TAG_DOIT, true); for (; base; base = base->next) { update_depsgraph_field_source_object(forest, obNode, ob, base->object); } @@ -232,10 +232,10 @@ static void update_depsgraph_flow_coll_object_new(struct DepsNodeHandle *node, Object *object2) { SmokeModifierData *smd; - if ((object2->id.flag & LIB_DOIT) == 0) { + if ((object2->id.tag & LIB_TAG_DOIT) == 0) { return; } - object2->id.flag &= ~LIB_DOIT; + object2->id.tag &= ~LIB_TAG_DOIT; smd = (SmokeModifierData *)modifiers_findByType(object2, eModifierType_Smoke); if (smd && (((smd->type & MOD_SMOKE_TYPE_FLOW) && smd->flow) || ((smd->type & MOD_SMOKE_TYPE_COLL) && smd->coll))) @@ -261,10 +261,10 @@ static void update_depsgraph_field_source_object_new(struct DepsNodeHandle *node Object *object, Object *object2) { - if ((object2->id.flag & LIB_DOIT) == 0) { + if ((object2->id.tag & LIB_TAG_DOIT) == 0) { return; } - object2->id.flag &= ~LIB_DOIT; + object2->id.tag &= ~LIB_TAG_DOIT; if (object2->pd && object2->pd->forcefield == PFIELD_SMOKEFLOW && object2->pd->f_source == object) { DEG_add_object_relation(node, object2, DEG_OB_COMP_TRANSFORM, "Field Source Object"); DEG_add_object_relation(node, object2, DEG_OB_COMP_GEOMETRY, "Field Source Object"); @@ -318,7 +318,7 @@ static void updateDepsgraph(ModifierData *md, } } else { - BKE_main_id_tag_listbase(&bmain->object, true); + BKE_main_id_tag_listbase(&bmain->object, LIB_TAG_DOIT, true); base = scene->base.first; for (; base; base = base->next) { update_depsgraph_flow_coll_object_new(node, base->object); @@ -326,7 +326,7 @@ static void updateDepsgraph(ModifierData *md, } /* add relation to all "smoke flow" force fields */ base = scene->base.first; - BKE_main_id_tag_listbase(&bmain->object, true); + BKE_main_id_tag_listbase(&bmain->object, LIB_TAG_DOIT, true); for (; base; base = base->next) { update_depsgraph_field_source_object_new(node, ob, base->object); } @@ -339,17 +339,17 @@ static void foreachIDLink(ModifierData *md, Object *ob, SmokeModifierData *smd = (SmokeModifierData *) md; if (smd->type == MOD_SMOKE_TYPE_DOMAIN && smd->domain) { - walk(userData, ob, (ID **)&smd->domain->coll_group); - walk(userData, ob, (ID **)&smd->domain->fluid_group); - walk(userData, ob, (ID **)&smd->domain->eff_group); + walk(userData, ob, (ID **)&smd->domain->coll_group, IDWALK_NOP); + walk(userData, ob, (ID **)&smd->domain->fluid_group, IDWALK_NOP); + walk(userData, ob, (ID **)&smd->domain->eff_group, IDWALK_NOP); if (smd->domain->effector_weights) { - walk(userData, ob, (ID **)&smd->domain->effector_weights->group); + walk(userData, ob, (ID **)&smd->domain->effector_weights->group, IDWALK_NOP); } } if (smd->type == MOD_SMOKE_TYPE_FLOW && smd->flow) { - walk(userData, ob, (ID **)&smd->flow->noise_texture); + walk(userData, ob, (ID **)&smd->flow->noise_texture, IDWALK_USER); } } |