diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-07-03 16:07:14 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-07-03 16:18:46 +0300 |
| commit | d97c3bc7ad13cb9e3ec2248ce035a62c28ac70f8 (patch) | |
| tree | 6dc5b6169e1398b4dc53f5aefc7304cb13ccbcda /source/blender/editors/interface/interface_regions.c | |
| parent | 871325e26fe12efe8bf8a7042d94896f2f7faf6c (diff) | |
| parent | eb1532a86094ba5d59bf62b1fbd50f74a639d0a8 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index fd6d056f7d4..738ebfcc5c2 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -2107,9 +2107,11 @@ static void ui_update_color_picker_buts_rgb(uiBlock *block, ColorPicker *cpicker continue; if (bt->rnaprop) { - ui_but_v3_set(bt, rgb); + /* original button that created the color picker already does undo + * push, so disable it on RNA buttons in the color picker block */ + UI_but_flag_disable(bt, UI_BUT_UNDO); } else if (STREQ(bt->str, "Hex: ")) { float rgb_gamma[3]; |