[Bf-blender-cvs] [0828361889d] master: Cleanup: Redundant check in depsgraph builder

Sergey Sharybin noreply at git.blender.org
Thu Aug 4 16:02:47 CEST 2022


Commit: 0828361889d440f6f978d7f77a809ee9b78f219b
Author: Sergey Sharybin
Date:   Thu Aug 4 15:47:35 2022 +0200
Branches: master
https://developer.blender.org/rB0828361889d440f6f978d7f77a809ee9b78f219b

Cleanup: Redundant check in depsgraph builder

The build_object_data_geometry() is never called on armatures.

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

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 f36d94c7563..cbc95a5d1a9 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -2263,12 +2263,7 @@ void DepsgraphRelationBuilder::build_object_data_geometry(Object *object)
     // add geometry collider relations
   }
   /* Make sure uber update is the last in the dependencies. */
-  if (object->type != OB_ARMATURE) {
-    /* Armatures does no longer require uber node. */
-    OperationKey obdata_ubereval_key(
-        &object->id, NodeType::GEOMETRY, OperationCode::GEOMETRY_EVAL);
-    add_relation(geom_init_key, obdata_ubereval_key, "Object Geometry UberEval");
-  }
+  add_relation(geom_init_key, obdata_ubereval_key, "Object Geometry UberEval");
   if (object->type == OB_MBALL) {
     Object *mom = BKE_mball_basis_find(scene_, object);
     ComponentKey mom_geom_key(&mom->id, NodeType::GEOMETRY);



More information about the Bf-blender-cvs mailing list