[Bf-blender-cvs] [224eb00] asset-experiments: Merge branch 'master' into asset-experiments

[Bastien Montagne]

Commit: 224eb0025fbfcab39d1d108d2c49532a18ab4219
Author: Bastien Montagne
Date:   Thu Jan 1 15:16:44 2015 +0100
Branches: asset-experiments
https://developer.blender.org/rB224eb0025fbfcab39d1d108d2c49532a18ab4219

Merge branch 'master' into asset-experiments

Conflicts:
	source/blender/editors/interface/interface_icons.c

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



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

diff --cc source/blender/editors/include/UI_interface_icons.h
index e6dd91c,6104505..de26cf0
--- a/source/blender/editors/include/UI_interface_icons.h
+++ b/source/blender/editors/include/UI_interface_icons.h
@@@ -66,8 -63,6 +66,8 @@@ void UI_icons_init(int first_dyn_id)
  int UI_icon_get_width(int icon_id);
  int UI_icon_get_height(int icon_id);
  
- void UI_id_icon_render(struct bContext *C, struct ID *id, const bool big, const bool wait);
++void UI_id_icon_render(const struct bContext *C, struct ID *id, const bool big, const bool wait);
 +
  void UI_icon_draw(float x, float y, int icon_id);
  void UI_icon_draw_preview(float x, float y, int icon_id);
  void UI_icon_draw_preview_aspect(float x, float y, int icon_id, float aspect);
diff --cc source/blender/editors/interface/interface_icons.c
index 33e6468,a54ced5..4f63440
--- a/source/blender/editors/interface/interface_icons.c
+++ b/source/blender/editors/interface/interface_icons.c
@@@ -931,7 -931,7 +931,7 @@@ static void icon_create_rect(struct Pre
  
  /* only called when icon has changed */
  /* only call with valid pointer from UI_icon_draw */
- static void icon_set_image(bContext *C, ID *id, PreviewImage *prv_img, enum eIconSizes size, const bool wait)
 -static void icon_set_image(const bContext *C, ID *id, PreviewImage *prv_img, enum eIconSizes size)
++static void icon_set_image(const bContext *C, ID *id, PreviewImage *prv_img, enum eIconSizes size, const bool wait)
  {
  	if (!prv_img) {
  		if (G.debug & G_DEBUG)
@@@ -1224,18 -1149,17 +1224,17 @@@ static void icon_draw_size(float x, flo
  	}
  }
  
- static void ui_id_preview_image_render_size(bContext *C, ID *id, PreviewImage *pi, int size, const bool wait)
 -static void ui_id_preview_image_render_size(const bContext *C, ID *id, PreviewImage *pi, int size)
++static void ui_id_preview_image_render_size(const bContext *C, ID *id, PreviewImage *pi, int size, const bool wait)
  {
  	if ((pi->changed[size] || !pi->rect[size])) { /* changed only ever set by dynamic icons */
  		/* create the rect if necessary */
- 
 -		icon_set_image(C, id, pi, size);
 +		icon_set_image(C, id, pi, size, wait);
  
  		pi->changed[size] = 0;
  	}
  }
  
- void UI_id_icon_render(bContext *C, ID *id, const bool big, const bool wait)
 -static void ui_id_icon_render(const bContext *C, ID *id, const bool big)
++void UI_id_icon_render(const bContext *C, ID *id, const bool big, const bool wait)
  {
  	PreviewImage *pi = BKE_previewimg_get(id);
  
@@@ -1259,8 -1183,7 +1258,7 @@@ static void ui_id_brush_render(const bC
  		/* check if rect needs to be created; changed
  		 * only set by dynamic icons */
  		if ((pi->changed[i] || !pi->rect[i])) {
- 
 -			icon_set_image(C, id, pi, i);
 +			icon_set_image(C, id, pi, i, false);
  			pi->changed[i] = 0;
  		}
  	}