[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25933] trunk/blender: - bugfix [#20654] the property edge_face_count of the Mesh-Object does not work

[Campbell Barton]

Revision: 25933
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25933
Author:   campbellbarton
Date:     2010-01-12 19:33:21 +0100 (Tue, 12 Jan 2010)

Log Message:
-----------
- bugfix [#20654] the property edge_face_count of the Mesh-Object does not work
- remove unneeded particle function

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/bpy_types.py
    trunk/blender/source/blender/blenkernel/intern/particle.c

Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py	2010-01-12 17:08:28 UTC (rev 25932)
+++ trunk/blender/release/scripts/modules/bpy_types.py	2010-01-12 18:33:21 UTC (rev 25933)
@@ -299,7 +299,7 @@
     @property
     def edge_face_count(self):
         edge_face_count_dict = self.edge_face_count_dict
-        return [edge_face_count_dict.get(ed.key, 0) for ed in mesh.edges]
+        return [edge_face_count_dict.get(ed.key, 0) for ed in self.edges]
 
     def edge_loops(self, faces=None, seams=()):
         """

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2010-01-12 17:08:28 UTC (rev 25932)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2010-01-12 18:33:21 UTC (rev 25933)
@@ -1000,12 +1000,7 @@
 	
 	return value;
 }
-static void weighted_particle_vector(float *v1, float *v2, float *v3, float *v4, float *weights, float *vec)
-{
-	vec[0]= weights[0]*v1[0] + weights[1]*v2[0] + weights[2]*v3[0] + weights[3]*v4[0];
-	vec[1]= weights[0]*v1[1] + weights[1]*v2[1] + weights[2]*v3[1] + weights[3]*v4[1];
-	vec[2]= weights[0]*v1[2] + weights[1]*v2[2] + weights[2]*v3[2] + weights[3]*v4[2];
-}
+
 void psys_interpolate_particle(short type, ParticleKey keys[4], float dt, ParticleKey *result, int velocity)
 {
 	float t[4];
@@ -1016,19 +1011,19 @@
 	else {
 		key_curve_position_weights(dt, t, type);
 
-		weighted_particle_vector(keys[0].co, keys[1].co, keys[2].co, keys[3].co, t, result->co);
+		interp_v3_v3v3v3v3(result->co, keys[0].co, keys[1].co, keys[2].co, keys[3].co, t);
 
 		if(velocity){
 			float temp[3];
 
 			if(dt>0.999f){
 				key_curve_position_weights(dt-0.001f, t, type);
-				weighted_particle_vector(keys[0].co, keys[1].co, keys[2].co, keys[3].co, t, temp);
+				interp_v3_v3v3v3v3(temp, keys[0].co, keys[1].co, keys[2].co, keys[3].co, t);
 				VECSUB(result->vel, result->co, temp);
 			}
 			else{
 				key_curve_position_weights(dt+0.001f, t, type);
-				weighted_particle_vector(keys[0].co, keys[1].co, keys[2].co, keys[3].co, t, temp);
+				interp_v3_v3v3v3v3(temp, keys[0].co, keys[1].co, keys[2].co, keys[3].co, t);
 				VECSUB(result->vel, temp, result->co);
 			}
 		}