[Bf-blender-cvs] [1a117ad] master: Fix T44263: Invalid parameters to fill_vn_fl in deform.c.

Bastien Montagne noreply at git.blender.org
Sun Apr 5 09:51:31 CEST 2015


Commit: 1a117ad40c62cfab3cec6c4513627e781cd2b331
Author: Bastien Montagne
Date:   Sun Apr 5 09:50:16 2015 +0200
Branches: master
https://developer.blender.org/rB1a117ad40c62cfab3cec6c4513627e781cd2b331

Fix T44263: Invalid parameters to fill_vn_fl in deform.c.

Own fault, thanks a bunch to LazyDodo for finding that - and odd
GCC did not warn about it...

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

M	source/blender/blenkernel/intern/deform.c

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

diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c
index 350b19b..72133cf 100644
--- a/source/blender/blenkernel/intern/deform.c
+++ b/source/blender/blenkernel/intern/deform.c
@@ -982,7 +982,7 @@ void BKE_defvert_extract_vgroup_to_vertweights(
 		}
 	}
 	else {
-		fill_vn_fl(r_weights, invert_vgroup ? 1.0f : 0.0f, num_verts);
+		fill_vn_fl(r_weights, num_verts, invert_vgroup ? 1.0f : 0.0f);
 	}
 }
 
@@ -1008,7 +1008,7 @@ void BKE_defvert_extract_vgroup_to_edgeweights(
 		MEM_freeN(tmp_weights);
 	}
 	else {
-		fill_vn_fl(r_weights, 0.0f, num_edges);
+		fill_vn_fl(r_weights, num_edges, 0.0f);
 	}
 }
 
@@ -1031,7 +1031,7 @@ void BKE_defvert_extract_vgroup_to_loopweights(
 		MEM_freeN(tmp_weights);
 	}
 	else {
-		fill_vn_fl(r_weights, 0.0f, num_loops);
+		fill_vn_fl(r_weights, num_loops, 0.0f);
 	}
 }
 
@@ -1060,7 +1060,7 @@ void BKE_defvert_extract_vgroup_to_polyweights(
 		MEM_freeN(tmp_weights);
 	}
 	else {
-		fill_vn_fl(r_weights, 0.0f, num_polys);
+		fill_vn_fl(r_weights, num_polys, 0.0f);
 	}
 }




More information about the Bf-blender-cvs mailing list