Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-12-05 18:43:27 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-12-06 12:21:33 +0300
commit630ed82ff2a953eac0d490aefef30379dc1ec878 (patch)
tree78f48d1033405e9e76f198c4fdbf87217da8fca5 /source/blender/depsgraph
parent8acca0e9e12cd83ecbe12b9610ff32b6a46269eb (diff)
Depsgraph: Remove workaround of parameters animation in lamp
Diffstat (limited to 'source/blender/depsgraph')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations.cc12
1 files changed, 2 insertions, 10 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index e52902b8c8a..1f384e35fc8 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1648,21 +1648,13 @@ void DepsgraphRelationBuilder::build_lamp(Object *object)
return;
}
lamp_id->tag |= LIB_TAG_DOIT;
-
- ComponentKey parameters_key(lamp_id, DEG_NODE_TYPE_PARAMETERS);
-
- if (needs_animdata_node(lamp_id)) {
- ComponentKey animation_key(lamp_id, DEG_NODE_TYPE_ANIMATION);
- add_relation(animation_key, parameters_key, "Lamp Parameters");
- }
-
/* lamp's nodetree */
- if (la->nodetree) {
+ if (la->nodetree != NULL) {
build_nodetree(la->nodetree);
+ ComponentKey parameters_key(lamp_id, DEG_NODE_TYPE_PARAMETERS);
ComponentKey nodetree_key(&la->nodetree->id, DEG_NODE_TYPE_PARAMETERS);
add_relation(nodetree_key, parameters_key, "NTree->Lamp Parameters");
}
-
/* textures */
build_texture_stack(la->mtex);
}