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:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-10-14 12:36:27 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-10-14 12:36:27 +0400
commitde724a258eda45d1fed2b2176006c3b2df8abea2 (patch)
treea472a24defdce561a27ed0b8780dbce91c279d05 /source/blender/editors/transform
parenta4ba73311b4c2d862145f86ca078216b7ecbb56f (diff)
parentc08e7e1dc0366c485dbea5ef1209f2cdb616fbb3 (diff)
Merge branch 'master' into texture_nodes_refactor
Diffstat (limited to 'source/blender/editors/transform')
-rw-r--r--source/blender/editors/transform/transform_conversions.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 86e6e611cf3..e27dafca9af 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -249,7 +249,7 @@ static void set_prop_dist(TransInfo *t, const bool with_dist)
}
dist_sq = len_squared_v3(vec);
- if ((tob->rdist == -1.0f) || (dist_sq < (tob->rdist * tob->rdist))) {
+ if ((tob->rdist == -1.0f) || (dist_sq < SQUARE(tob->rdist))) {
tob->rdist = sqrtf(dist_sq);
}
}