diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2019-10-10 23:47:04 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2019-10-10 23:49:46 +0300 |
| commit | b8f769fee80b8534f8f40e3af0b0d5e24a92f923 (patch) | |
| tree | 45433c8b71d9d519a376a4131e3cdccd726e8031 /source/blender/draw/modes | |
| parent | b50b91c25dbd23a0a0e4177e6aadf54c82968ba7 (diff) | |
Fix T64901: Nesting collection instances could clutter object display
Diffstat (limited to 'source/blender/draw/modes')
| -rw-r--r-- | source/blender/draw/modes/object_mode.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index ec19c731e96..21e1dff7128 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -3541,6 +3541,10 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) if (hide_object_extra) { break; } + if ((ob->base_flag & BASE_FROM_DUPLI) && (ob->transflag & OB_DUPLICOLLECTION) && + ob->instance_collection) { + break; + } DRW_shgroup_empty(sh_data, sgl, ob, view_layer, rv3d, draw_ctx->sh_cfg); break; case OB_SPEAKER: |