[Bf-blender-cvs] [0297763] master: Tweak for smoothing limits in stretch-constraint volume preservation.

[Lukas Tönne]

Commit: 0297763afafae7392348728580f3ae38e1208354
Author: Lukas Tönne
Date:   Tue Oct 14 11:03:13 2014 +0200
Branches: master
https://developer.blender.org/rB0297763afafae7392348728580f3ae38e1208354

Tweak for smoothing limits in stretch-constraint volume preservation.

Uses a arctan instead of sine function now, which has the advantage of
not overestimating the bulging.

===================================================================

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/blenkernel/intern/constraint.c

===================================================================

diff --git a/release/datafiles/locale b/release/datafiles/locale
index c980697..841b1b9 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit c980697651ad7f21a7cd8ad23dc26e482b5fa752
+Subproject commit 841b1b9f494b6f980da4e244bbd86ecb8a8ac0b7
diff --git a/release/scripts/addons b/release/scripts/addons
index c210f87..fd695c3 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit c210f87f12929bbd0884db7bf76baa3f1eed7b02
+Subproject commit fd695c3a81b63db072311e8516e0dbb8d4474047
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index e4b60c1..3a9eb31 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -2693,11 +2693,9 @@ static void stretchto_evaluate(bConstraint *con, bConstraintOb *cob, ListBase *t
 			const float bulge_median = ((data->flag & STRETCHTOCON_USE_BULGE_MIN) ?
 			                            0.5f * (data->bulge_min + data->bulge_max) : 0.0f);
 			const float bulge_range = data->bulge_max - bulge_median;
-			float x, bulge_smoothed;
+			float bulge_smoothed;
 
-			x = bulge_range != 0.0f ? (bulge - bulge_median) / bulge_range : 0.0f;
-			CLAMP(x, -1.0f, 1.0f);
-			bulge_smoothed = bulge_median + bulge_range * sinf(0.5f*M_PI * x);
+			bulge_smoothed = bulge_median + bulge_range * atanf(bulge - bulge_median) / (0.5f * M_PI);
 
 			if (data->flag & STRETCHTOCON_USE_BULGE_MIN) {
 				CLAMP_MIN(bulge, data->bulge_min);