diff options
author | Ton Roosendaal <ton@blender.org> | 2010-11-21 16:01:22 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2010-11-21 16:01:22 +0300 |
commit | 722376ed7baf73e3ab6727047130f19873113429 (patch) | |
tree | c455a9988614da2c5cd133fbfa481a37b346bc36 /source/blender/editors | |
parent | cd2ab75b737f17c00bca6caa6c54af76d6dcfa6f (diff) |
Bugfix #24824
Color Picker: when inserting keys (right mouse menu), the colors didn't
change for buttons to indicate such. The function that sets the flags
returned too early.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 643e1fa3fb7..5e68a7279a9 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -5006,18 +5006,12 @@ void uiContextAnimUpdate(const bContext *C) } if(activebut) { - if(activebut->rnapoin.data) { - /* found RNA button */ + /* always recurse into opened menu, so all buttons update (like colorpicker) */ + uiHandleButtonData *data= activebut->active; + if(data && data->menu) + ar = data->menu->region; + else return; - } - else { - /* recurse into opened menu */ - uiHandleButtonData *data= activebut->active; - if(data && data->menu) - ar = data->menu->region; - else - return; - } } else { /* no active button */ |