[Bf-blender-cvs] [b9c5da9] id-remap: Merge branch 'master' into id-remap

[Bastien Montagne]

Commit: b9c5da9ba8e6e01d77b93afede504e5dc325b123
Author: Bastien Montagne
Date:   Fri Dec 18 22:17:25 2015 +0100
Branches: id-remap
https://developer.blender.org/rBb9c5da9ba8e6e01d77b93afede504e5dc325b123

Merge branch 'master' into id-remap

Conflicts:
	source/blender/editors/space_outliner/outliner_edit.c
	source/blender/editors/space_outliner/outliner_intern.h
	source/blender/editors/space_outliner/outliner_tools.c

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



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

diff --cc source/blender/editors/space_outliner/outliner_tools.c
index e854f4f,e2f5747..d28a365
--- a/source/blender/editors/space_outliner/outliner_tools.c
+++ b/source/blender/editors/space_outliner/outliner_tools.c
@@@ -248,10 -245,10 +248,10 @@@ static void unlink_world_cb(bContext *U
  	parscene->world = NULL;
  }
  
- static void outliner_do_libdata_operation(bContext *C, Scene *scene, SpaceOops *soops, ListBase *lb, 
-                                           void (*operation_cb)(bContext *C, Scene *scene, TreeElement *,
-                                                                TreeStoreElem *, TreeStoreElem *, void *),
-                                           void *user_data)
+ static void outliner_do_libdata_operation(
 -        bContext *C, Scene *scene, SpaceOops *soops, ListBase *lb, 
++        bContext *C, Scene *scene, SpaceOops *soops, ListBase *lb,
+         void (*operation_cb)(bContext *C, Scene *scene, TreeElement *, TreeStoreElem *, TreeStoreElem *, void *),
+         void *user_data)
  {
  	TreeElement *te;
  	TreeStoreElem *tselem;
@@@ -522,8 -519,8 +522,7 @@@ static void group_instance_cb(bContext 
   */
  void outliner_do_object_operation_ex(
          bContext *C, Scene *scene_act, SpaceOops *soops, ListBase *lb,
--        void (*operation_cb)(bContext *C, Scene *scene, TreeElement *,
--                             TreeStoreElem *, TreeStoreElem *, void *),
++        void (*operation_cb)(bContext *, Scene *, TreeElement *, TreeStoreElem *, TreeStoreElem *, void *),
          bool select_recurse)
  {
  	TreeElement *te;