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-12-16 18:22:48 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-12-16 18:22:48 +0400
commit9a2290cf5fcbd86f6a738d6aead3649796dc06f4 (patch)
treed090f03a3bf17d0b657f2ddbef95a43501450464 /source/blender
parent7965b6995edfb8cf8bfd04dbf2114ca6b23ddd5a (diff)
fix for bevel using the wrong property name when shift was held.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/editors/mesh/editmesh_tools.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index c04e74a717c..ec9da47c9ac 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -4950,9 +4950,9 @@ static float edbm_bevel_mval_factor(wmOperator *op, wmEvent *event)
if (event->shift) {
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");
+#else
+ opdata->shift_factor = RNA_float_get(op->ptr, "factor");
#endif
}
factor = (factor - opdata->shift_factor) * 0.1f + opdata->shift_factor;