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>2011-11-15 06:05:32 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-11-15 06:05:32 +0400
commite59ab6486f9e7285815671044b785c28365d5165 (patch)
tree4a9406c8181a817a8b96243ae167acc740ed20f7 /source/blender/editors/transform/transform_generics.c
parent35ab6cabbf62187290e417dba6d8b18cd4fe18de (diff)
parentb1019a56b54294fc91293c5c43ef46d54950ae84 (diff)
svn merge -r41751:41779 ^/trunk/blender
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
-rw-r--r--source/blender/editors/transform/transform_generics.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 82920ca51ff..82b34861b27 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -198,8 +198,9 @@ static void clipMirrorModifier(TransInfo *t, Object *ob)
clip = 0;
if(axis & 1) {
- if(fabs(iloc[0])<=tolerance[0] ||
- loc[0]*iloc[0]<0.0f) {
+ if(fabsf(iloc[0])<=tolerance[0] ||
+ loc[0]*iloc[0]<0.0f)
+ {
loc[0]= 0.0f;
clip = 1;
}
@@ -207,14 +208,16 @@ static void clipMirrorModifier(TransInfo *t, Object *ob)
if(axis & 2) {
if(fabs(iloc[1])<=tolerance[1] ||
- loc[1]*iloc[1]<0.0f) {
+ loc[1]*iloc[1]<0.0f)
+ {
loc[1]= 0.0f;
clip = 1;
}
}
if(axis & 4) {
if(fabs(iloc[2])<=tolerance[2] ||
- loc[2]*iloc[2]<0.0f) {
+ loc[2]*iloc[2]<0.0f)
+ {
loc[2]= 0.0f;
clip = 1;
}