[Bf-blender-cvs] [a3ae53b99e9] master: Bevel: revert idea of always starting in offset mode.

[Howard Trickey]

Commit: a3ae53b99e989eb1c6d62ad16a5a6a3fa6e0db20
Author: Howard Trickey
Date:   Fri Mar 8 07:42:16 2019 -0500
Branches: master
https://developer.blender.org/rBa3ae53b99e989eb1c6d62ad16a5a6a3fa6e0db20

Bevel: revert idea of always starting in offset mode.

Commit 208fafb to fix bevel tool units included a change to always
start modal in offset mode. This was may or may not be right but
broke a way in which users could set percent mode and then subsequently
start a modal that bevels in that mode. So going back to old way.

===================================================================

M	source/blender/editors/mesh/editmesh_bevel.c

===================================================================

diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c
index 477a5b068ac..1b301f8f6eb 100644
--- a/source/blender/editors/mesh/editmesh_bevel.c
+++ b/source/blender/editors/mesh/editmesh_bevel.c
@@ -209,12 +209,11 @@ static bool edbm_bevel_init(bContext *C, wmOperator *op, const bool is_modal)
 	BevelData *opdata;
 	ViewLayer *view_layer = CTX_data_view_layer(C);
 	float pixels_per_inch;
-	int i;
+	int i, otype;
 
 	if (is_modal) {
 		RNA_float_set(op->ptr, "offset", 0.0f);
 		RNA_float_set(op->ptr, "offset_pct", 0.0f);
-		RNA_enum_set(op->ptr, "offset_type", BEVEL_AMT_OFFSET);
 	}
 
 	op->customdata = opdata = MEM_mallocN(sizeof(BevelData), "beveldata_mesh_operator");
@@ -241,7 +240,8 @@ static bool edbm_bevel_init(bContext *C, wmOperator *op, const bool is_modal)
 	}
 
 	opdata->is_modal = is_modal;
-	opdata->value_mode = OFFSET_VALUE;
+	otype = RNA_enum_get(op->ptr, "offset_type");
+	opdata->value_mode = (otype == BEVEL_AMT_PERCENT) ? OFFSET_VALUE_PERCENT : OFFSET_VALUE;
 	opdata->segments = (float) RNA_int_get(op->ptr, "segments");
 	pixels_per_inch = U.dpi * U.pixelsize;