svn merge -r40140:r40148 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-12 04:57:20 +00:00
parent 2fa642b6e9 9a1f3c587e
commit fddc655aec
31 changed files with 485 additions and 429 deletions
--- a/source/blender/modifiers/intern/MOD_weightvgproximity.c
+++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c
@@ -116,7 +116,7 @@ static void get_vert2geom_distance(int numVerts, float (*v_cos)[3],
 		float tmp_co[3];

 		/* Convert the vertex to tree coordinates. */
-		VECCOPY(tmp_co, v_cos[i]);
+		copy_v3_v3(tmp_co, v_cos[i]);
 		space_transform_apply(loc2trgt, tmp_co);

 		/* Use local proximity heuristics (to reduce the nearest search).