[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34383] trunk/blender/source/blender/ editors/interface/interface_icons.c: Small fix for my last fix: ignore the `preview' flag; if either size

[Nicholas Bishop]

Revision: 34383
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34383
Author:   nicholasbishop
Date:     2011-01-18 04:32:41 +0000 (Tue, 18 Jan 2011)
Log Message:
-----------
Small fix for my last fix: ignore the `preview' flag; if either size
has been marked for update then do it regardless. Otherwise changing
the texture type doesn't always update the brush texture preview.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_icons.c

Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c	2011-01-18 04:08:01 UTC (rev 34382)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c	2011-01-18 04:32:41 UTC (rev 34383)
@@ -1001,7 +1001,7 @@
 	}
 }
 
-void ui_id_icon_render(bContext *C, ID *id, int preview)
+void ui_id_icon_render(bContext *C, ID *id, int UNUSED(preview))
 {
 	PreviewImage *pi = BKE_previewimg_get(id); 
 	int i;
@@ -1013,8 +1013,7 @@
 		/* check if preview rect needs to be created; changed
 		   only set by dynamic icons */
 		if((pi->changed[i] || !pi->rect[i])) {
-			if(i == 0 || preview)
-				icon_set_image(C, id, pi, i);
+			icon_set_image(C, id, pi, i);
 			pi->changed[i] = 0;
 		}
 	}