[Bf-blender-cvs] [1b7623fc06] surface-deform-modifier: Change angle function calls in sdef

[Luca Rood]

Commit: 1b7623fc06997951eb906aa11a2491febe86d8f6
Author: Luca Rood
Date:   Sat Jan 14 01:49:52 2017 -0200
Branches: surface-deform-modifier
https://developer.blender.org/rB1b7623fc06997951eb906aa11a2491febe86d8f6

Change angle function calls in sdef

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

M	source/blender/modifiers/intern/MOD_surfacedeform.c

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

diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c b/source/blender/modifiers/intern/MOD_surfacedeform.c
index 5836703caa..801e5526e3 100644
--- a/source/blender/modifiers/intern/MOD_surfacedeform.c
+++ b/source/blender/modifiers/intern/MOD_surfacedeform.c
@@ -471,7 +471,7 @@ BLI_INLINE SDefBindWeightData *computeBindWeights(SDefBindCalcData * const data,
 				normal_poly_v3(bpoly->normal, bpoly->coords, poly->totloop);
 
 				/* Compute poly skew angle and axis */
-				angle = saacos(dot_v3v3(bpoly->normal, world));
+				angle = angle_normalized_v3v3(bpoly->normal, world);
 
 				cross_v3_v3v3(axis, bpoly->normal, world);
 				normalize_v3(axis);
@@ -517,13 +517,13 @@ BLI_INLINE SDefBindWeightData *computeBindWeights(SDefBindCalcData * const data,
 				bpoly->scales[1] = normalize_v2(bpoly->cent_edgemid_vecs_v2[1]);
 
 				/* Compute the required polygon angles */
-				bpoly->edgemid_angle = saacos(dot_v2v2(bpoly->cent_edgemid_vecs_v2[0], bpoly->cent_edgemid_vecs_v2[1]));
+				bpoly->edgemid_angle = angle_normalized_v2v2(bpoly->cent_edgemid_vecs_v2[0], bpoly->cent_edgemid_vecs_v2[1]);
 
 				sub_v2_v2v2(tmp_vec_v2, bpoly->coords_v2[bpoly->corner_ind], bpoly->centroid_v2);
 				normalize_v2(tmp_vec_v2);
 
-				bpoly->corner_edgemid_angles[0] = saacos(dot_v2v2(tmp_vec_v2, bpoly->cent_edgemid_vecs_v2[0]));
-				bpoly->corner_edgemid_angles[1] = saacos(dot_v2v2(tmp_vec_v2, bpoly->cent_edgemid_vecs_v2[1]));
+				bpoly->corner_edgemid_angles[0] = angle_normalized_v2v2(tmp_vec_v2, bpoly->cent_edgemid_vecs_v2[0]);
+				bpoly->corner_edgemid_angles[1] = angle_normalized_v2v2(tmp_vec_v2, bpoly->cent_edgemid_vecs_v2[1]);
 
 				/* Check for inifnite weights, and compute angular data otherwise */
 				if (bpoly->weight_components[2] < FLT_EPSILON) {
@@ -539,8 +539,8 @@ BLI_INLINE SDefBindWeightData *computeBindWeights(SDefBindCalcData * const data,
 					sub_v2_v2v2(cent_point_vec, bpoly->point_v2, bpoly->centroid_v2);
 					normalize_v2(cent_point_vec);
 
-					bpoly->point_edgemid_angles[0] = saacos(dot_v2v2(cent_point_vec, bpoly->cent_edgemid_vecs_v2[0]));
-					bpoly->point_edgemid_angles[1] = saacos(dot_v2v2(cent_point_vec, bpoly->cent_edgemid_vecs_v2[1]));
+					bpoly->point_edgemid_angles[0] = angle_normalized_v2v2(cent_point_vec, bpoly->cent_edgemid_vecs_v2[0]);
+					bpoly->point_edgemid_angles[1] = angle_normalized_v2v2(cent_point_vec, bpoly->cent_edgemid_vecs_v2[1]);
 				}
 			}
 		}