diff options
author | Julian Eisel <julian@blender.org> | 2020-06-13 23:54:07 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2020-06-13 23:54:07 +0300 |
commit | 5e50380ddc99dd8c8c8067482b2dce186e7c3fb4 (patch) | |
tree | 7e5f438a3a30996351a7ee256ffd144e2dab45ad /source/blender/draw/intern/draw_manager.c | |
parent | 15e6f9012c84c4ebce41bf1928635a3abe046a55 (diff) | |
parent | 23d0361b30da481ffe71142d4efd336dfb1f27f2 (diff) |
Merge branch 'master' into asset-uuid
Diffstat (limited to 'source/blender/draw/intern/draw_manager.c')
-rw-r--r-- | source/blender/draw/intern/draw_manager.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index e7dff422105..2ba766f4729 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1467,6 +1467,7 @@ void DRW_draw_render_loop_ex(struct Depsgraph *depsgraph, /* Only iterate over objects for internal engines or when overlays are enabled */ if (do_populate_loop) { + DST.dupli_origin = NULL; DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN (depsgraph, ob) { if ((object_type_exclude_viewport & (1 << ob->type)) != 0) { continue; @@ -1864,6 +1865,7 @@ void DRW_render_object_iter( const int object_type_exclude_viewport = draw_ctx->v3d ? draw_ctx->v3d->object_type_exclude_viewport : 0; + DST.dupli_origin = NULL; DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN (depsgraph, ob) { if ((object_type_exclude_viewport & (1 << ob->type)) == 0) { DST.dupli_parent = data_.dupli_parent; @@ -2121,6 +2123,7 @@ void DRW_draw_select_loop(struct Depsgraph *depsgraph, const int object_type_exclude_select = (v3d->object_type_exclude_viewport | v3d->object_type_exclude_select); bool filter_exclude = false; + DST.dupli_origin = NULL; DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN (depsgraph, ob) { if (!BKE_object_is_visible_in_viewport(v3d, ob)) { continue; @@ -2271,6 +2274,7 @@ static void drw_draw_depth_loop_imp(struct Depsgraph *depsgraph, drw_engines_world_update(DST.draw_ctx.scene); const int object_type_exclude_viewport = v3d->object_type_exclude_viewport; + DST.dupli_origin = NULL; DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN (DST.draw_ctx.depsgraph, ob) { if ((object_type_exclude_viewport & (1 << ob->type)) != 0) { continue; |