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

[Bastien Montagne]

Commit: 28adc7d24874aa4bba88a3bfc3c00539ab9ab456
Author: Bastien Montagne
Date:   Wed Jan 20 14:27:45 2016 +0100
Branches: id-remap
https://developer.blender.org/rB28adc7d24874aa4bba88a3bfc3c00539ab9ab456

Merge branch 'master' into id-remap

Conflicts:
	source/blender/blenkernel/intern/library_query.c

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



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

diff --cc source/blender/blenkernel/intern/library_query.c
index aee9d8e,f5e17c0..cf186b6
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@@ -255,11 -223,8 +255,11 @@@ void BKE_library_foreach_ID_link(ID *id
  			CALLBACK_INVOKE(scene->world, IDWALK_USER);
  			CALLBACK_INVOKE(scene->set, IDWALK_NOP);
  			CALLBACK_INVOKE(scene->clip, IDWALK_NOP);
 -			CALLBACK_INVOKE(scene->nodetree, IDWALK_NOP);
 +			if (scene->nodetree) {
 +				/* nodetree **are owned by IDs**, treat them as mere sub-data and not real ID! */
 +				BKE_library_foreach_ID_link((ID *)scene->nodetree, callback, user_data, flag);
 +			}
- 			/* DO NOT handle scene->basact here, it’s doubling with the loop over whole scene->base later,
+ 			/* DO NOT handle scene->basact here, it's doubling with the loop over whole scene->base later,
  			 * since basact is just a pointer to one of those items. */
  			CALLBACK_INVOKE(scene->obedit, IDWALK_NOP);
  
diff --cc source/blender/windowmanager/WM_api.h
index 8428b63,fc0a3a6..1bbff19
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@@ -191,12 -191,12 +191,12 @@@ void		WM_ndof_deadzone_set(float deadzo
  void		WM_event_add_notifier(const struct bContext *C, unsigned int type, void *reference);
  void		WM_main_add_notifier(unsigned int type, void *reference);
  void		WM_main_remove_notifier_reference(const void *reference);
 -void		WM_main_remove_editor_id_reference(const struct ID *id);
 +void		WM_main_remap_editor_id_reference(struct ID *old_id, struct ID *new_id);
  
  			/* reports */
- void        WM_report_banner_show(const struct bContext *C);
- void        WM_report(const struct bContext *C, ReportType type, const char *message);
- void        WM_reportf(const struct bContext *C, ReportType type, const char *format, ...) ATTR_PRINTF_FORMAT(3, 4);
+ void        WM_report_banner_show(void);
+ void        WM_report(ReportType type, const char *message);
+ void        WM_reportf(ReportType type, const char *format, ...) ATTR_PRINTF_FORMAT(2, 3);
  
  void wm_event_add_ex(
          struct wmWindow *win, const struct wmEvent *event_to_add,