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:
authorCampbell Barton <ideasman42@gmail.com>2012-11-27 13:47:22 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-11-27 13:47:22 +0400
commit7c36100930ad3461b1f41667b14ccee01d37d302 (patch)
treec5262128303fcdfd7e962da9ba4afa1011bad849 /source/blender/editors/mesh
parentc00a1b7493822abc62723e16082a908b221c6514 (diff)
new bevel was still referring to old property name (holding shift wasnt working while beveling).
Diffstat (limited to 'source/blender/editors/mesh')
-rw-r--r--source/blender/editors/mesh/editmesh_tools.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index 566372155ba..b3093e0be12 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -4949,8 +4949,13 @@ static float edbm_bevel_mval_factor(wmOperator *op, wmEvent *event)
/* Fake shift-transform... */
if (event->shift) {
- if (opdata->shift_factor < 0.0f)
+ if (opdata->shift_factor < 0.0f) {
+#ifdef NEW_BEVEL
+ opdata->shift_factor = RNA_float_get(op->ptr, "factor");
+#else
opdata->shift_factor = RNA_float_get(op->ptr, "percent");
+#endif
+ }
factor = (factor - opdata->shift_factor) * 0.1f + opdata->shift_factor;
}
else if (opdata->shift_factor >= 0.0f)