[Bf-blender-cvs] [630ed82ff2a] master: Depsgraph: Remove workaround of parameters animation in lamp

[Sergey Sharybin]

Commit: 630ed82ff2a953eac0d490aefef30379dc1ec878
Author: Sergey Sharybin
Date:   Tue Dec 5 16:43:27 2017 +0100
Branches: master
https://developer.blender.org/rB630ed82ff2a953eac0d490aefef30379dc1ec878

Depsgraph: Remove workaround of parameters animation in lamp

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

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

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

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);
 }