diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-12-27 13:53:50 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-12-27 14:00:33 +0300 |
| commit | 3fcf535d2e003ad939fa1f1c7aa4d5da1b38aef7 (patch) | |
| tree | 0cc5b044cdc1f7b6fa58ad1d0c3c6cafc51a7759 /source/blender/modifiers/intern/MOD_smoke.c | |
| parent | ec2ca11cba496294838bfb5fb76f7bfcef2fe8cc (diff) | |
Split id->flag in two, persistent flags and runtime tags.
This is purely internal sanitizing/cleanup, no change in behavior is expected at all.
This change was also needed because we were getting short on ID flags, and
future enhancement of 'user_one' ID behavior requires two new ones.
id->flag remains for persistent data (fakeuser only, so far!), this also allows us
100% backward & forward compatibility.
New id->tag is used for most flags. Though written in .blend files, its content
is cleared at read time.
Note that .blend file version was bumped, so that we can clear runtimeflags from
old .blends, important in case we add new persistent flags in future.
Also, behavior of tags (either status ones, or whether they need to be cleared before/after use)
has been added as comments to their declaration.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D1683
Diffstat (limited to 'source/blender/modifiers/intern/MOD_smoke.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_smoke.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c index f0f235c8ad5..3dcb03da52c 100644 --- a/source/blender/modifiers/intern/MOD_smoke.c +++ b/source/blender/modifiers/intern/MOD_smoke.c @@ -123,10 +123,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))) @@ -153,10 +153,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"); @@ -233,10 +233,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))) @@ -262,10 +262,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"); |