Commit: 0bf8bb28244fe56a5e5c15e73780028d5d5c02ca
Author: Sergey Sharybin
Date: Mon Mar 16 20:04:01 2015 +0500
Branches: depsgraph_refactor
https://developer.blender.org/rB0bf8bb28244fe56a5e5c15e73780028d5d5c02ca
Depsgraph: Use more unique relation names
===================================================================
M source/blender/depsgraph/intern/depsgraph_build_relations.cpp
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
index e53b88a..cf648fb 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
@@ -1672,7 +1672,7 @@ void DepsgraphRelationBuilder::build_lamp(Object *ob)
build_nodetree(lamp_id, la->nodetree);
ComponentKey nodetree_key(&la->nodetree->id,
DEPSNODE_TYPE_PARAMETERS);
add_relation(nodetree_key, parameters_key,
- DEPSREL_TYPE_COMPONENT_ORDER, "Lamp Parameters");
+ DEPSREL_TYPE_COMPONENT_ORDER, "NTree->Lamp
Parameters");
}
/* textures */
@@ -1706,7 +1706,7 @@ void DepsgraphRelationBuilder::build_nodetree(ID *owner,
bNodeTree *ntree)
ComponentKey parameters_key(ntree_id, DEPSNODE_TYPE_PARAMETERS);
ComponentKey animation_key(ntree_id, DEPSNODE_TYPE_ANIMATION);
add_relation(animation_key, parameters_key,
- DEPSREL_TYPE_COMPONENT_ORDER, "Lamp Parameters");
+ DEPSREL_TYPE_COMPONENT_ORDER, "NTree Parameters");
}
// TODO: link from nodetree to owner_component?
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs