diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-06 13:27:18 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-06 13:27:18 +0400 |
| commit | 6ac2bb8b9480de3a308ca320b7c0de123e49a5af (patch) | |
| tree | a98c1df1da01550814bf309060aa0bf05def9391 /source/blender/editors/interface | |
| parent | ec9ac9faba1b9f82fa16e710e881b38d1ff7ea76 (diff) | |
| parent | 3b1e077b397130c4f663161a9b6ce235fa418b8a (diff) | |
Merging r42442 through r42457 from trunk into soc-2011-tomato
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index c24d07f73b9..c6159487145 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -5241,9 +5241,10 @@ static void button_activate_state(bContext *C, uiBut *but, uiHandleButtonState s data->state= state; - if(state != BUTTON_STATE_EXIT) { + if(!ELEM(state, BUTTON_STATE_EXIT, BUTTON_STATE_HIGHLIGHT)) { /* When objects for eg. are removed, running ui_check_but() - * can access the removed data - so disable update on exit */ + * can access the removed data - so disable update on exit + * or highlight */ ui_check_but(but); } |