[Bf-blender-cvs] [c5daddbef3a] blender2.8: Revert "Fix some groups not showing in the viewport"
Dalai Felinto
noreply at git.blender.org
Thu Jun 8 19:29:17 CEST 2017
Commit: c5daddbef3aa445942b2e90ce0990d420cdbea55
Author: Dalai Felinto
Date: Thu Jun 8 19:03:42 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBc5daddbef3aa445942b2e90ce0990d420cdbea55
Revert "Fix some groups not showing in the viewport"
This reverts commit c19fedf636ec3de503f5929432003702801ebcf3.
===================================================================
M source/blender/depsgraph/intern/depsgraph_query.cc
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc
index 1c84a7bd5f5..df5997af283 100644
--- a/source/blender/depsgraph/intern/depsgraph_query.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query.cc
@@ -145,6 +145,13 @@ static bool deg_objects_dupli_iterator_next(BLI_Iterator *iter)
data->dupli_object_next = data->dupli_object_next->next;
+ /* Group duplis need to set ob matrices correct, for deform. so no_draw
+ * is part handled.
+ */
+ if ((obd->transflag & OB_RENDER_DUPLI) == 0 && dob->no_draw) {
+ continue;
+ }
+
if (obd->type == OB_MBALL) {
continue;
}
More information about the Bf-blender-cvs
mailing list