[Bf-blender-cvs] [93d4752dbe6] blender2.8: Depsgraph: Correction for the previous commit

Sergey Sharybin noreply at git.blender.org
Wed Sep 19 17:49:43 CEST 2018


Commit: 93d4752dbe67882dd0883e31fe94c3b541fcb0f7
Author: Sergey Sharybin
Date:   Wed Sep 19 17:49:08 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB93d4752dbe67882dd0883e31fe94c3b541fcb0f7

Depsgraph: Correction for the previous commit

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

M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index ae95d32ea40..c17277beca1 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1899,11 +1899,13 @@ void DepsgraphRelationBuilder::build_object_data_geometry(Object *object)
 		add_relation(geom_init_key,
 		             obdata_ubereval_key,
 		             "Object Geometry UberEval");
-		ComponentKey object_shading_key(&object->id, DEG_NODE_TYPE_SHADING);
-		DepsRelation *rel = add_relation(obdata_ubereval_key,
-		                                 object_shading_key,
-		                                 "Object Geometry batch Update");
-		rel->flag |= DEPSREL_FLAG_NO_FLUSH;
+		if (object->totcol != 0) {
+			ComponentKey object_shading_key(&object->id, DEG_NODE_TYPE_SHADING);
+			DepsRelation *rel = add_relation(obdata_ubereval_key,
+			                                 object_shading_key,
+			                                 "Object Geometry batch Update");
+			rel->flag |= DEPSREL_FLAG_NO_FLUSH;
+		}
 	}
 	if (object->type == OB_MBALL) {
 		Object *mom = BKE_mball_basis_find(scene_, object);



More information about the Bf-blender-cvs mailing list