diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-04-08 04:32:32 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-08 04:32:32 +0400 |
| commit | 634dfcdeccc6567af58cab35196a4639cbc1dd68 (patch) | |
| tree | 40f43a3e15a829d18551ea94bc02f053bda1e821 /source | |
| parent | 9244cbef14913ad7e8d31f14542781819c6607a2 (diff) | |
fix for fix: re-activating buttons to fix [#33466], meant the icon didn't get refreshed immediately.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/bmesh/intern/bmesh_interp.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c index b6585811fd5..c1b10e3537f 100644 --- a/source/blender/bmesh/intern/bmesh_interp.c +++ b/source/blender/bmesh/intern/bmesh_interp.c @@ -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; diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 34293569bd1..095155a9814 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -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 */ |