[Bf-blender-cvs] [a7d43eb1c6e] blender2.8: Depsgraph: Another followup to the previous commit

Sergey Sharybin noreply at git.blender.org
Wed Sep 19 18:03:45 CEST 2018


Commit: a7d43eb1c6e1679d4bdf15a9f558f2dbf0fb5b24
Author: Sergey Sharybin
Date:   Wed Sep 19 18:03:15 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa7d43eb1c6e1679d4bdf15a9f558f2dbf0fb5b24

Depsgraph: Another followup to the previous commit

Apparently, only mesh objects has SHADING component.

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

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 c17277beca1..b47ed4638ad 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1899,7 +1899,7 @@ void DepsgraphRelationBuilder::build_object_data_geometry(Object *object)
 		add_relation(geom_init_key,
 		             obdata_ubereval_key,
 		             "Object Geometry UberEval");
-		if (object->totcol != 0) {
+		if (object->totcol != 0 && object->type == OB_MESH) {
 			ComponentKey object_shading_key(&object->id, DEG_NODE_TYPE_SHADING);
 			DepsRelation *rel = add_relation(obdata_ubereval_key,
 			                                 object_shading_key,



More information about the Bf-blender-cvs mailing list