Commit: eb1532a86094ba5d59bf62b1fbd50f74a639d0a8
Author: Brecht Van Lommel
Date: Sun Jul 2 21:25:25 2017 +0200
Branches: master
https://developer.blender.org/rBeb1532a86094ba5d59bf62b1fbd50f74a639d0a8
Fix T51772: double undo entry for color picker editing.
===================================================================
M source/blender/editors/interface/interface_regions.c
===================================================================
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];
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
