UI: only reset eyedropper on cancel when set

1 files changed, 5 insertions, 1 deletions

diff --git a/source/blender/editors/interface/interface_eyedropper_depth.c b/source/blender/editors/interface/interface_eyedropper_depth.c
index 4d0a95a6bbd..1634e7c6bd4 100644
--- a/source/blender/editors/interface/interface_eyedropper_depth.c
+++ b/source/blender/editors/interface/interface_eyedropper_depth.c
@@ -69,6 +69,7 @@ typedef struct DepthDropper {
 	PropertyRNA *prop;
 	bool is_undo;
 
+	bool is_set;
 	float init_depth; /* for resetting on cancel */
 
 	bool  accum_start; /* has mouse been presed */
@@ -219,6 +220,7 @@ static void depthdropper_depth_sample_pt(bContext *C, DepthDropper *ddr, int mx,
 static void depthdropper_depth_set(bContext *C, DepthDropper *ddr, const float depth)
 {
 	RNA_property_float_set(&ddr->ptr, ddr->prop, depth);
+	ddr->is_set = true;
 	RNA_property_update(C, &ddr->ptr, ddr->prop);
 }
 
@@ -255,7 +257,9 @@ static void depthdropper_depth_sample_accum(bContext *C, DepthDropper *ddr, int
 static void depthdropper_cancel(bContext *C, wmOperator *op)
 {
 	DepthDropper *ddr = op->customdata;
-	depthdropper_depth_set(C, ddr, ddr->init_depth);
+	if (ddr->is_set) {
+		depthdropper_depth_set(C, ddr, ddr->init_depth);
+	}
 	depthdropper_exit(C, op);
 }