diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-11-22 21:51:40 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-11-22 21:51:40 +0300 |
| commit | 01117ca27b7f0211a2d045e75494cc422df4b8d9 (patch) | |
| tree | 89fb64a5fe32f91bf4bf7fdedcd6a588679dc047 /source/blender/editors | |
| parent | ce9ce42e3894608fbf68fb7e6db976992a621644 (diff) | |
Bugfix #24823
Color picker: RMB "insert single value" was inserting all three values.
Same case as yesterday, made code recurse into open menu to check for
active button there.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 5e68a7279a9..9216e3f2a83 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -4960,15 +4960,14 @@ void uiContextActiveProperty(const bContext *C, struct PointerRNA *ptr, struct P if(activebut) { if(activebut->rnapoin.data) { + uiHandleButtonData *data= activebut->active; + /* found RNA button */ *ptr= activebut->rnapoin; *prop= activebut->rnaprop; *index= activebut->rnaindex; - return; - } - else { - /* recurse into opened menu */ - uiHandleButtonData *data= activebut->active; + + /* recurse into opened menu, like colorpicker case */ if(data && data->menu) ar = data->menu->region; else |