[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55888] trunk/blender/source/blender: fix for fix: re-activating buttons to fix [#33466], meant the icon didn' t get refreshed immediately.

[Campbell Barton]

Revision: 55888
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55888
Author:   campbellbarton
Date:     2013-04-08 00:32:32 +0000 (Mon, 08 Apr 2013)
Log Message:
-----------
fix for fix: re-activating buttons to fix [#33466], meant the icon didn't get refreshed immediately.

Modified Paths:
--------------
    trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
    trunk/blender/source/blender/editors/interface/interface.c

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_interp.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_interp.c	2013-04-08 00:25:44 UTC (rev 55887)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_interp.c	2013-04-08 00:32:32 UTC (rev 55888)
@@ -197,7 +197,6 @@
 
 	void **blocks   = BLI_array_alloca(blocks, source->len);
 	float (*cos_2d)[2] = BLI_array_alloca(cos_2d, source->len);
-	float *w        = BLI_array_alloca(w,      source->len);
 	float axis_mat[3][3];  /* use normal to transform into 2d xy coords */
 	int i;
 

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2013-04-08 00:25:44 UTC (rev 55887)
+++ trunk/blender/source/blender/editors/interface/interface.c	2013-04-08 00:32:32 UTC (rev 55888)
@@ -645,6 +645,10 @@
 				/* still stuff needs to be copied */
 				oldbut->rect = but->rect;
 				oldbut->context = but->context; /* set by Layout */
+
+				/* drawing */
+				oldbut->icon = but->icon;
+				oldbut->iconadd = but->iconadd;
 				
 				/* typically the same pointers, but not on undo/redo */
 				/* XXX some menu buttons store button itself in but->poin. Ugly */