[Bf-blender-cvs] [b2c84c53634] greasepencil-object: Fix merge error

[Antonio Vazquez]

Commit: b2c84c536345ab0b39c5a21256efde3974c0c2f5
Author: Antonio Vazquez
Date:   Wed Dec 6 22:22:59 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb2c84c536345ab0b39c5a21256efde3974c0c2f5

Fix merge error

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

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 72eb387e5f5..0f8b9bcea1f 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -1936,15 +1936,6 @@ void DepsgraphRelationBuilder::build_palette(Palette *palette)
 	build_animdata(&palette->id);
 }
 
-bool DepsgraphRelationBuilder::needs_animdata_node(ID *id)
-{
-	AnimData *adt = BKE_animdata_from_id(id);
-	if (adt != NULL) {
-		return (adt->action != NULL) || (adt->nla_tracks.first != NULL);
-	}
-	return false;
-}
-
 void DepsgraphRelationBuilder::build_cachefile(CacheFile *cache_file) {
 	/* Animation. */
 	build_animdata(&cache_file->id);