[Bf-blender-cvs] [b8f769fee80] master: Fix T64901: Nesting collection instances could clutter object display

Dalai Felinto noreply at git.blender.org
Thu Oct 10 22:50:57 CEST 2019


Commit: b8f769fee80b8534f8f40e3af0b0d5e24a92f923
Author: Dalai Felinto
Date:   Thu Oct 10 17:47:04 2019 -0300
Branches: master
https://developer.blender.org/rBb8f769fee80b8534f8f40e3af0b0d5e24a92f923

Fix T64901: Nesting collection instances could clutter object display

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

M	source/blender/draw/modes/object_mode.c

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

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:



More information about the Bf-blender-cvs mailing list