diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-23 13:42:06 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-11-23 13:47:47 +0300 |
commit | 7ba1babc902b9baf460b26ac24a19497231b64b5 (patch) | |
tree | a1c0fa2bfb1c458b0fd3f88f5f7c0c4c50ef5fd8 /source/blender/depsgraph/intern/depsgraph_query.cc | |
parent | 99f518043537238577b332be64f83a812fbb4253 (diff) | |
parent | f3fa5c1258d2fb08b83e080b99172ccc0dc1d67a (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/depsgraph/intern/depsgraph_query.cc')
-rw-r--r-- | source/blender/depsgraph/intern/depsgraph_query.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc index 9740e93ffec..6ffdfeac644 100644 --- a/source/blender/depsgraph/intern/depsgraph_query.cc +++ b/source/blender/depsgraph/intern/depsgraph_query.cc @@ -242,21 +242,21 @@ static void deg_objects_iterator_step(BLI_Iterator *iter, DEG::IDDepsNode *id_no return; } - Object *ob = (Object *)id_node->id_cow; - BLI_assert(DEG::deg_validate_copy_on_write_datablock(&ob->id)); + Object *object = (Object *)id_node->id_cow; + BLI_assert(DEG::deg_validate_copy_on_write_datablock(&object->id)); - if (deg_flush_base_flags_and_settings(data, ob, ob, false) == false) { + if (deg_flush_base_flags_and_settings(data, object, object, false) == false) { iter->skip = true; return; } - if ((data->flag & DEG_OBJECT_ITER_FLAG_DUPLI) && (ob->transflag & OB_DUPLI)) { - data->dupli_parent = ob; - data->dupli_list = object_duplilist(&data->eval_ctx, data->scene, ob); + if ((data->flag & DEG_OBJECT_ITER_FLAG_DUPLI) && (object->transflag & OB_DUPLI)) { + data->dupli_parent = object; + data->dupli_list = object_duplilist(&data->eval_ctx, data->scene, object); data->dupli_object_next = (DupliObject *)data->dupli_list->first; } - iter->current = ob; + iter->current = object; } void DEG_objects_iterator_begin(BLI_Iterator *iter, DEGObjectsIteratorData *data) |