blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix logic for bitwise flags in bases during deg iterator 

Spotted/reported by Sergey Sharybin.
This commit is contained in:
Dalai Felinto 2017-06-02 14:30:37 +02:00
parent c5dccc9734
commit 8ff405ebd4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/depsgraph/intern/depsgraph_query.cc
View File

@ -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;
}