Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2010-11-21 16:01:22 +0300
committerTon Roosendaal <ton@blender.org>2010-11-21 16:01:22 +0300
commit722376ed7baf73e3ab6727047130f19873113429 (patch)
treec455a9988614da2c5cd133fbfa481a37b346bc36 /source/blender/editors
parentcd2ab75b737f17c00bca6caa6c54af76d6dcfa6f (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.c16
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 */