[Bf-blender-cvs] [8ff405ebd49] blender2.8: Fix logic for bitwise flags in bases during deg iterator

[Dalai Felinto]

Commit: 8ff405ebd490503173dbaf78e56da7327329a4fd
Author: Dalai Felinto
Date:   Fri Jun 2 14:30:37 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB8ff405ebd490503173dbaf78e56da7327329a4fd

Fix logic for bitwise flags in bases during deg iterator

Spotted/reported by Sergey Sharybin.

===================================================================

M	source/blender/depsgraph/intern/depsgraph_query.cc

===================================================================

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