[Bf-blender-cvs] [f2b57c3] master: Depsgraph: Fix matrix_world driver source

Sergey Sharybin noreply at git.blender.org
Wed Nov 23 11:09:43 CET 2016


Commit: f2b57c35327eda6399659f42c326b96b8af49d82
Author: Sergey Sharybin
Date:   Wed Nov 23 11:09:05 2016 +0100
Branches: master
https://developer.blender.org/rBf2b57c35327eda6399659f42c326b96b8af49d82

Depsgraph: Fix matrix_world driver source

Reported by Dalai in IRC, thanks!

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

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

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

diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc
index 9a4a35a..5604044 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -189,16 +189,23 @@ static bool pointer_to_component_node_criteria(const PointerRNA *ptr,
 		/* Transforms props? */
 		if (prop) {
 			const char *prop_identifier = RNA_property_identifier((PropertyRNA *)prop);
-
+			/* TODO(sergey): How to optimize this? */
 			if (strstr(prop_identifier, "location") ||
 			    strstr(prop_identifier, "rotation") ||
-			    strstr(prop_identifier, "scale"))
+			    strstr(prop_identifier, "scale") ||
+			    strstr(prop_identifier, "matrix_"))
 			{
 				*type = DEPSNODE_TYPE_TRANSFORM;
 				return true;
 			}
+			else if (strstr(prop_identifier, "data")) {
+				/* We access object.data, most likely a geometry.
+				 * Might be a bone tho..
+				 */
+				*type = DEPSNODE_TYPE_GEOMETRY;
+				return true;
+			}
 		}
-		// ...
 	}
 	else if (ptr->type == &RNA_ShapeKey) {
 		Key *key = (Key *)ptr->id.data;




More information about the Bf-blender-cvs mailing list