diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-05 23:54:59 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-05 23:54:59 +0400 |
| commit | 63ad25c30ddca609d39e3ae6288cdddeed7fb918 (patch) | |
| tree | 14c7f3423ab41c22a2901dd3170990f322e5d9f9 /source/blender/editors/interface | |
| parent | c40d8921b8b61c0465a2fe9bca72dc418bf39c7d (diff) | |
Cycles:
Fix #29475: remove node from properties editor crash on windows. This was a bug
in the UI code, which code access removed data.
Fix OpenCL still being used in a case where Experimental was disabled.
Fix msvc debug warning in md5 code.
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); } |