diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-24 17:02:08 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-09-24 17:02:08 +0400 |
| commit | c12d16cf4bf21964fb2e50e9334416d571b8ca3a (patch) | |
| tree | e414b8477f529fe1fd5f1459604bc70064afade3 /source/blender/editors/interface | |
| parent | cd95229a179974cb1757edaef005f4065e04b585 (diff) | |
Fix #32396: EyeDropper does nothing on "New" in Uv image editor
For now simply hide color picker button for properties which doesn't
have RNA path. Trying to make color picker working would end up with
design limitations like not bale to run two operators the same time.
Used RNA_property_path_from_ID_check for check which is marked as
slow and need to be used with care. Since this function is only called
from a popup, shouldn't be a big problem.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index adf839d433b..cc0217e0d79 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -2144,8 +2144,10 @@ static void uiBlockPicker(uiBlock *block, float rgba[4], PointerRNA *ptr, Proper uiButSetFunc(bt, do_picker_new_mode_cb, bt, NULL); uiBlockEndAlign(block); - bt = uiDefIconButO(block, BUT, "UI_OT_eyedropper", WM_OP_INVOKE_DEFAULT, ICON_EYEDROPPER, butwidth + 10, -60, UI_UNIT_X, UI_UNIT_Y, NULL); - uiButSetFunc(bt, close_popup_cb, bt, NULL); + if (RNA_property_path_from_ID_check(ptr, prop)) { + bt = uiDefIconButO(block, BUT, "UI_OT_eyedropper", WM_OP_INVOKE_DEFAULT, ICON_EYEDROPPER, butwidth + 10, -60, UI_UNIT_X, UI_UNIT_Y, NULL); + uiButSetFunc(bt, close_popup_cb, bt, NULL); + } /* RGB values */ uiBlockBeginAlign(block); |