[Bf-blender-cvs] [b84085ef1a0] master: Fix T63145: nested instancers not respecting Display Instancer setting

Brecht Van Lommel noreply at git.blender.org
Mon Jun 17 14:32:52 CEST 2019


Commit: b84085ef1a0a0b484177ad174b789296ad23b5ff
Author: Brecht Van Lommel
Date:   Mon Jun 17 13:39:47 2019 +0200
Branches: master
https://developer.blender.org/rBb84085ef1a0a0b484177ad174b789296ad23b5ff

Fix T63145: nested instancers not respecting Display Instancer setting

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

M	source/blender/depsgraph/intern/depsgraph_query_iter.cc

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

diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index 06632d7e510..251857b58c9 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -153,7 +153,7 @@ bool deg_objects_dupli_iterator_next(BLI_Iterator *iter)
     temp_dupli_object->base_flag |= BASE_VISIBLE;
 
     int ob_visibility = BKE_object_visibility(temp_dupli_object, data->eval_mode);
-    if (ob_visibility == 0) {
+    if ((ob_visibility & (OB_VISIBLE_SELF | OB_VISIBLE_PARTICLES)) == 0) {
       continue;
     }



More information about the Bf-blender-cvs mailing list