[Bf-blender-cvs] [d6c7163c06] surface-deform-modifier: Fix 2d mapping function's name

[Luca Rood]

Commit: d6c7163c061484906ee947dad6381e1fbbc0bbc1
Author: Luca Rood
Date:   Wed Jan 11 03:57:25 2017 -0200
Branches: surface-deform-modifier
https://developer.blender.org/rBd6c7163c061484906ee947dad6381e1fbbc0bbc1

Fix 2d mapping function's name

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

M       source/blender/blenlib/BLI_math_geom.h
M       source/blender/blenlib/intern/math_geom.c
M       source/blender/modifiers/intern/MOD_surfacedeform.c

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

diff --git a/source/blender/blenlib/BLI_math_geom.h 
b/source/blender/blenlib/BLI_math_geom.h
index c6475037ac..49208c4fd1 100644
--- a/source/blender/blenlib/BLI_math_geom.h
+++ b/source/blender/blenlib/BLI_math_geom.h
@@ -393,7 +393,7 @@ void box_minmax_bounds_m4(float min[3], float max[3],
 void map_to_tube(float *r_u, float *r_v, const float x, const float y, const 
float z);
 void map_to_sphere(float *r_u, float *r_v, const float x, const float y, const 
float z);
 void map_to_plane_v2_v3v3(float r_co[2], const float co[3], const float no[3]);
-void map_to_plane_axis_angle_v2_v3v3(float r_co[2], const float co[3], const 
float axis[3], const float angle);
+void map_to_plane_axis_angle_v2_v3v3fl(float r_co[2], const float co[3], const 
float axis[3], const float angle);
 
 /********************************** Normals **********************************/
 
diff --git a/source/blender/blenlib/intern/math_geom.c 
b/source/blender/blenlib/intern/math_geom.c
index 6707fab252..618da5ae41 100644
--- a/source/blender/blenlib/intern/math_geom.c
+++ b/source/blender/blenlib/intern/math_geom.c
@@ -4058,10 +4058,10 @@ void map_to_plane_v2_v3v3(float r_co[2], const float 
co[3], const float no[3])
 
        angle = saacos(dot_v3v3(no, target));
 
-       map_to_plane_axis_angle_v2_v3v3(r_co, co, axis, angle);
+       map_to_plane_axis_angle_v2_v3v3fl(r_co, co, axis, angle);
 }
 
-void map_to_plane_axis_angle_v2_v3v3(float r_co[2], const float co[3], const 
float axis[3], const float angle)
+void map_to_plane_axis_angle_v2_v3v3fl(float r_co[2], const float co[3], const 
float axis[3], const float angle)
 {
        float tmp[3];
 
diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.c 
b/source/blender/modifiers/intern/MOD_surfacedeform.c
index 5e78cd8f2a..c0c1fd4ba6 100644
--- a/source/blender/modifiers/intern/MOD_surfacedeform.c
+++ b/source/blender/modifiers/intern/MOD_surfacedeform.c
@@ -522,11 +522,11 @@ BLI_INLINE SDefBindWeightData 
*computeBindWeights(SDefBindCalcData * const data,
                                normalize_v3(axis);
 
                                /* Map coords onto 2d normal plane */
-                               
map_to_plane_axis_angle_v2_v3v3(bpoly->point_v2, point_co, axis, angle);
+                               
map_to_plane_axis_angle_v2_v3v3fl(bpoly->point_v2, point_co, axis, angle);
 
                                zero_v2(bpoly->centroid_v2);
                                for (j = 0; j < poly->totloop; j++) {
-                                       
map_to_plane_axis_angle_v2_v3v3(bpoly->coords_v2[j], bpoly->coords[j], axis, 
angle);
+                                       
map_to_plane_axis_angle_v2_v3v3fl(bpoly->coords_v2[j], bpoly->coords[j], axis, 
angle);
                                        madd_v2_v2fl(bpoly->centroid_v2, 
bpoly->coords_v2[j], 1.0f / poly->totloop);
                                }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs