[Bf-blender-cvs] [16f1084] depsgraph_refactor: Depsgraph: Fix for superfluous errors arising from trying to add animation link when no animation exists

[Joshua Leung]

Commit: 16f10845831dfdc55a8ecedc0c5532e53397cf70
Author: Joshua Leung
Date:   Fri Jan 30 19:31:16 2015 +1300
Branches: depsgraph_refactor
https://developer.blender.org/rB16f10845831dfdc55a8ecedc0c5532e53397cf70

Depsgraph: Fix for superfluous errors arising from trying to add animation link when no animation exists

This is for the animdata link used for rigs. The one for plain object data worked
already.

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

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 bc4c0cc..2d5a7fb 100644
--- a/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
+++ b/source/blender/depsgraph/intern/depsgraph_build_relations.cpp
@@ -1137,9 +1137,9 @@ void DepsgraphRelationBuilder::build_rig(Scene *scene, Object *ob)
 	
 	add_relation(init_key, flush_key, DEPSREL_TYPE_COMPONENT_ORDER, "[Pose Init -> Pose Cleanup]");
 
-	if (ob->adt != NULL) {
+	if (ob->adt && (ob->adt->action || ob->adt->nla_tracks.first)) {
 		ComponentKey animation_key(&ob->id, DEPSNODE_TYPE_ANIMATION);
-		add_relation(animation_key, init_key, DEPSREL_TYPE_OPERATION, "Object Animation");
+		add_relation(animation_key, init_key, DEPSREL_TYPE_OPERATION, "Rig Animation");
 	}
 
 	/* IK Solvers...