Commit: f3b9af077c88c6d822183f98b247157612a497a9
Author: Sergey Sharybin
Date: Mon Mar 16 15:15:40 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rBf3b9af077c88c6d822183f98b247157612a497a9
Depsgraph: Fix driving property with lattice resolution
===================================================================
M source/blender/depsgraph/intern/depsgraph_build_nodes.cpp
M source/blender/depsgraph/intern/depsgraph_build_relations.cpp
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_build_nodes.cpp
b/source/blender/depsgraph/intern/depsgraph_build_nodes.cpp
index 2ce285e..8492440 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_nodes.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build_nodes.cpp
@@ -860,6 +860,10 @@ void DepsgraphNodeBuilder::build_obdata_geom(Scene *scene,
Object *ob)
add_operation_node(obdata, DEPSNODE_TYPE_GEOMETRY,
DEPSOP_TYPE_POST, NULL,
DEG_OPCODE_PLACEHOLDER, "Eval Done");
+
+ /* Parameters for driver sources. */
+ add_operation_node(obdata, DEPSNODE_TYPE_PARAMETERS, DEPSOP_TYPE_EXEC,
NULL,
+ DEG_OPCODE_PLACEHOLDER, "Parameters Eval");
}
/* Cameras */
diff --git a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
index f80ca87..58d2408 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
@@ -1550,6 +1550,13 @@ void DepsgraphRelationBuilder::build_obdata_geom(Scene
*scene, Object *ob)
if (key) {
build_shapekeys(obdata, key);
}
+
+ if (BKE_animdata_from_id(obdata) != NULL) {
+ ComponentKey animation_key(obdata, DEPSNODE_TYPE_ANIMATION);
+ ComponentKey parameters_key(obdata, DEPSNODE_TYPE_PARAMETERS);
+ add_relation(animation_key, parameters_key,
+ DEPSREL_TYPE_COMPONENT_ORDER, "Geom Parameters");
+ }
}
/* Cameras */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
