fix for fix: re-activating buttons to fix [#33466], meant the icon didn't get refreshed immediately.

This commit is contained in:
Campbell Barton
2013-04-08 00:32:32 +00:00
parent 9244cbef14
commit 634dfcdecc
2 changed files with 4 additions and 1 deletions

View File

@@ -197,7 +197,6 @@ void BM_face_interp_from_face(BMesh *bm, BMFace *target, BMFace *source)
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;

View File

@@ -645,6 +645,10 @@ static int ui_but_update_from_old_block(const bContext *C, uiBlock *block, uiBut
/* 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 */