[Bf-blender-cvs] [f913e690935] master: Depsgraph: Add missing expansion od custom bone shapes

Sergey Sharybin noreply at git.blender.org
Wed Apr 4 10:16:07 CEST 2018


Commit: f913e6909353aab51f2b1381799130be4f8b5625
Author: Sergey Sharybin
Date:   Wed Apr 4 10:15:45 2018 +0200
Branches: master
https://developer.blender.org/rBf913e6909353aab51f2b1381799130be4f8b5625

Depsgraph: Add missing expansion od custom bone shapes

This was fixed in 2.8 branch but not in master.

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

M	source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
M	source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
index 0c7c3d13d93..b9a53c69070 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes_rig.cc
@@ -284,6 +284,11 @@ void DepsgraphNodeBuilder::build_rig(Object *object)
 			}
 		}
 
+		/* Custom shape. */
+		if (pchan->custom != NULL) {
+			build_object(NULL, pchan->custom);
+		}
+
 		pchan_index++;
 	}
 }
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
index b9850209d7d..db8f987fa39 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_rig.cc
@@ -436,6 +436,11 @@ void DepsgraphRelationBuilder::build_rig(Object *object)
 
 		/* assume that all bones must be done for the pose to be ready (for deformers) */
 		add_relation(bone_done_key, flush_key, "PoseEval Result-Bone Link");
+
+		/* Custom shape. */
+		if (pchan->custom != NULL) {
+			build_object(pchan->custom);
+		}
 	}
 }



More information about the Bf-blender-cvs mailing list