diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-01-18 01:31:39 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-18 01:31:39 +0300 |
commit | 2757469824bbe98d943b42f57ff23782b97a3abf (patch) | |
tree | 8fcb55970a4e1e5b42605a245823076df1f3b195 /source/blender/editors/interface/interface_eyedropper_colorband.c | |
parent | 7a0cc955cc0b13e69412ff64b83bea1fcbbb9206 (diff) |
UI: only reset eyedropper on cancel when set
Diffstat (limited to 'source/blender/editors/interface/interface_eyedropper_colorband.c')
-rw-r--r-- | source/blender/editors/interface/interface_eyedropper_colorband.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_eyedropper_colorband.c b/source/blender/editors/interface/interface_eyedropper_colorband.c index dd4524c9066..805e1177d87 100644 --- a/source/blender/editors/interface/interface_eyedropper_colorband.c +++ b/source/blender/editors/interface/interface_eyedropper_colorband.c @@ -73,6 +73,7 @@ typedef struct EyedropperColorband { PointerRNA ptr; PropertyRNA *prop; bool is_undo; + bool is_set; } EyedropperColorband; /* For user-data only. */ @@ -132,6 +133,7 @@ static void eyedropper_colorband_sample_point(bContext *C, EyedropperColorband * eye->color_buffer_len += 1; eye->last_x = mx; eye->last_y = my; + eye->is_set = true; } } @@ -172,14 +174,17 @@ static void eyedropper_colorband_apply(bContext *C, wmOperator *op) /* Always filter, avoids noise in resulting color-band. */ bool filter_samples = true; BKE_colorband_init_from_table_rgba(eye->color_band, eye->color_buffer, eye->color_buffer_len, filter_samples); + eye->is_set = true; RNA_property_update(C, &eye->ptr, eye->prop); } static void eyedropper_colorband_cancel(bContext *C, wmOperator *op) { EyedropperColorband *eye = op->customdata; - *eye->color_band = eye->init_color_band; - RNA_property_update(C, &eye->ptr, eye->prop); + if (eye->is_set) { + *eye->color_band = eye->init_color_band; + RNA_property_update(C, &eye->ptr, eye->prop); + } eyedropper_colorband_exit(C, op); } |