diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-06-02 14:05:14 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-06-02 14:05:15 +0300 |
commit | c5dccc9734829d1fa21c425c7a06646134f0d8ba (patch) | |
tree | ff43c5099ed229a67b49835b4d7a7a785261bc6b /source/blender/makesrna/intern | |
parent | 9dddd73ee3092182a7c1ccf4b4e7ea2b29a5c50b (diff) |
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;
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r-- | source/blender/makesrna/intern/rna_depsgraph.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
2 files changed, 2 insertions, 2 deletions
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. */ |