diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-07-02 22:25:25 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-07-02 22:27:41 +0300 |
| commit | eb1532a86094ba5d59bf62b1fbd50f74a639d0a8 (patch) | |
| tree | fcb165895b0db3f41f72e9504ba12c6b9c16fd22 /source/blender/editors/interface/interface_regions.c | |
| parent | 29c8c5044217297a8bbb8c9c359d3eb7aec200eb (diff) | |
Fix T51772: double undo entry for color picker editing.
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 534bd4278ca..5ed94474726 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -2099,9 +2099,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]; |