[Bf-blender-cvs] [c5dccc97348] blender2.8: Fixup for 824bf261f773 so Cycles does not show dupli

[Dalai Felinto]

Commit: c5dccc9734829d1fa21c425c7a06646134f0d8ba
Author: Dalai Felinto
Date:   Fri Jun 2 13:05:14 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBc5dccc9734829d1fa21c425c7a06646134f0d8ba

Fixup for 824bf261f773 so Cycles does not show dupli

Cycles is using rna_depsgraph, not rna_scene. Duplis are still not working there
but now at least it shows it was showing before the commit.

To show duplis in Cycles do:

-       data->flag = DEG_OBJECT_ITER_FLAG_SET;
+       data->flag = DEG_OBJECT_ITER_FLAG_ALL;

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

M	source/blender/makesrna/intern/rna_depsgraph.c
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c
index d992e88431c..22566ea2296 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@ -90,7 +90,7 @@ static void rna_Depsgraph_objects_begin(CollectionPropertyIterator *iter, Pointe
 	DEGObjectsIteratorData *data = MEM_callocN(sizeof(DEGObjectsIteratorData), __func__);
 
 	data->graph = (Depsgraph *)ptr->data;
-	data->flag = DEG_OBJECT_ITER_FLAG_ALL;
+	data->flag = DEG_OBJECT_ITER_FLAG_SET;
 
 	DEG_objects_iterator_begin(iter->internal.custom, data);
 	iter->valid = ((BLI_Iterator *)iter->internal.custom)->valid;
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index ab7ed835e5c..9326d169776 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -3024,7 +3024,7 @@ static int rna_SceneLayer_multiple_engines_get(PointerRNA *UNUSED(ptr))
 static void rna_SceneLayer_update_tagged(SceneLayer *UNUSED(sl), bContext *C)
 {
 	Depsgraph *graph = CTX_data_depsgraph(C);
-	DEG_OBJECT_ITER(graph, ob, DEG_OBJECT_ITER_FLAG_SET)
+	DEG_OBJECT_ITER(graph, ob, DEG_OBJECT_ITER_FLAG_ALL)
 	{
 		/* Don't do anything, we just need to run the iterator to flush
 		 * the base info to the objects. */