diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-06-02 15:30:37 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-06-02 15:30:45 +0300 |
| commit | 8ff405ebd490503173dbaf78e56da7327329a4fd (patch) | |
| tree | 589f2c35837b99cb7e4746f00535a50cdb7e3798 /source/blender/depsgraph/intern | |
| parent | c5dccc9734829d1fa21c425c7a06646134f0d8ba (diff) | |
Fix logic for bitwise flags in bases during deg iterator
Spotted/reported by Sergey Sharybin.
Diffstat (limited to 'source/blender/depsgraph/intern')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_query.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc index 3456347e348..c87d6fd99e0 100644 --- a/source/blender/depsgraph/intern/depsgraph_query.cc +++ b/source/blender/depsgraph/intern/depsgraph_query.cc @@ -124,7 +124,7 @@ void DEG_objects_iterator_begin(BLI_Iterator *iter, DEGObjectsIteratorData *data */ static void deg_flush_data(Object *ob, Base *base, const int flag) { - ob->base_flag = (base->flag | BASE_FROM_SET) & flag; + ob->base_flag = (base->flag | BASE_FROM_SET | BASE_FROMDUPLI) & flag; ob->base_collection_properties = base->collection_properties; ob->base_selection_color = base->selcol; } |