diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-08 15:34:25 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-08 15:49:39 +0300 |
| commit | 3750dfaa0a23130f1fc5200b67443ce68fa4d930 (patch) | |
| tree | e49d032c13694ac10245f31deaa7a876fba275d0 /source/blender/depsgraph | |
| parent | da4bfb87703e49806aff5ce4ed75deaf8c7310e1 (diff) | |
Partial Fix T53269: Dupli-verts/dupli-faces not working
This fixes the issue for the Draw Manager, but for Cycles this is still not
working. The iterator bpy.context.depsgraph.duplis seems to be correct though.
Diffstat (limited to 'source/blender/depsgraph')
| -rw-r--r-- | source/blender/depsgraph/intern/depsgraph_query.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc index e950aa58112..4431df80b69 100644 --- a/source/blender/depsgraph/intern/depsgraph_query.cc +++ b/source/blender/depsgraph/intern/depsgraph_query.cc @@ -134,7 +134,7 @@ static bool deg_flush_base_flags_and_settings( { Base *base; Depsgraph *graph = data->graph; - SceneLayer *scene_layer = DEG_get_evaluated_scene_layer(graph); + SceneLayer *scene_layer = data->eval_ctx.scene_layer; int flag = is_dupli ? BASE_FROMDUPLI : 0; /* First attempt, see if object is in the current SceneLayer. */ @@ -261,6 +261,7 @@ void DEG_objects_iterator_begin(BLI_Iterator *iter, DEGObjectsIteratorData *data iter->data = data; DEG_evaluation_context_init(&data->eval_ctx, DAG_EVAL_RENDER); + data->eval_ctx.scene_layer = DEG_get_evaluated_scene_layer(graph); data->dupli_parent = NULL; data->dupli_list = NULL; |