[Bf-blender-cvs] [37f58ff] libquery-recursive: Forgot to include AnimationData into new recursive libquery foreach...

[Bastien Montagne]

Commit: 37f58ffec97f9fdf30cfd7b23e9704107143054b
Author: Bastien Montagne
Date:   Thu Feb 25 14:20:58 2016 +0100
Branches: libquery-recursive
https://developer.blender.org/rB37f58ffec97f9fdf30cfd7b23e9704107143054b

Forgot to include AnimationData into new recursive libquery foreach...

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

M	source/blender/blenkernel/intern/library_query.c

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

diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index eeb0790..73b1294 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -235,7 +235,6 @@ static void library_foreach_mtex(LibraryForeachIDData *data, MTex *mtex)
  */
 void BKE_library_foreach_ID_link(ID *id, LibraryIDLinkCallback callback, void *user_data, int flag)
 {
-	AnimData *adt;
 	LibraryForeachIDData data;
 	int i;
 
@@ -249,16 +248,10 @@ void BKE_library_foreach_ID_link(ID *id, LibraryIDLinkCallback callback, void *u
 	else {
 		data.ids_handled = NULL;
 	}
-
 	data.flag = flag;
 	data.callback = callback;
 	data.user_data = user_data;
 
-	adt = BKE_animdata_from_id(id);
-	if (adt) {
-		library_foreach_animationData(&data, adt);
-	}
-
 #define CALLBACK_INVOKE_ID(check_id, cb_flag) \
 	FOREACH_CALLBACK_INVOKE_ID(&data, check_id, cb_flag)
 
@@ -268,6 +261,11 @@ void BKE_library_foreach_ID_link(ID *id, LibraryIDLinkCallback callback, void *u
 	do {
 		data.self_id = id;
 
+		AnimData *adt = BKE_animdata_from_id(id);
+		if (adt) {
+			library_foreach_animationData(&data, adt);
+		}
+
 		switch (GS(id->name)) {
 			case ID_SCE:
 			{