[Bf-blender-cvs] [b6022f1] id-remap: Fix for new libquery callback API.

[Bastien Montagne]

Commit: b6022f14889ffab2c93c970d1c811e8761942270
Author: Bastien Montagne
Date:   Thu Feb 18 23:11:03 2016 +0100
Branches: id-remap
https://developer.blender.org/rBb6022f14889ffab2c93c970d1c811e8761942270

Fix for new libquery callback API.

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

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

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

diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index b005187..61b65e3 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1106,7 +1106,7 @@ enum {
 	ID_REMAP_IS_USER_ONE_SKIPPED    = 1 << 1,  /* There was some skipped 'user_one' usages of old_id. */
 };
 
-static bool foreach_libblock_remap_callback(void *user_data, ID **id_p, int cb_flag)
+static int foreach_libblock_remap_callback(void *user_data, ID *UNUSED(self_id), ID **id_p, int cb_flag)
 {
 	IDRemap *id_remap_data = user_data;
 	ID *old_id = id_remap_data->old_id;
@@ -1182,7 +1182,7 @@ static bool foreach_libblock_remap_callback(void *user_data, ID **id_p, int cb_f
 		}
 	}
 
-	return true;
+	return IDWALK_RET_NOP;
 }
 
 /**