Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Montagne <montagne29@wanadoo.fr>2017-11-23 22:34:03 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2017-11-23 22:34:03 +0300
commitc9477888305b647abb89702ab2316ba5f93033b1 (patch)
treedccbc97b5916cfa5e474d672cb134437b7223b01 /source/blender/editors/mesh
parent4f8bffa7bfe46192b43c75d864e2117369cbffdd (diff)
parentff9eab7926da46d62cede2d3d061fcfe2531f622 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r--source/blender/editors/mesh/editmesh_bevel.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c
index 2af05a9ad8d..e541df8ffa3 100644
--- a/source/blender/editors/mesh/editmesh_bevel.c
+++ b/source/blender/editors/mesh/editmesh_bevel.c
@@ -335,11 +335,12 @@ static int edbm_bevel_invoke(bContext *C, wmOperator *op, const wmEvent *event)
* ideally this will never happen and should be checked for above */
opdata->mcenter[0] = opdata->mcenter[1] = 0;
}
- edbm_bevel_calc_initial_length(op, event, false);
/* for OFFSET_VALUE only, the scale is the size of a pixel under the mouse in 3d space */
opdata->scale[OFFSET_VALUE] = rv3d ? ED_view3d_pixel_size(rv3d, center_3d) : 1.0f;
+ edbm_bevel_calc_initial_length(op, event, false);
+
edbm_bevel_update_header(C, op);
if (!edbm_bevel_calc(op)) {