- bugfix [#20654] the property edge_face_count of the Mesh-Object does not work
authorCampbell Barton <ideasman42@gmail.com>
Tue, 12 Jan 2010 18:33:21 +0000 (18:33 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 12 Jan 2010 18:33:21 +0000 (18:33 +0000)
- remove unneeded particle function

release/scripts/modules/bpy_types.py
source/blender/blenkernel/intern/particle.c

index a535673051cb5f64531bdcab8a1321fbe173d220..88dcb7eb8de244a6b6df7a1baf5075725cbd742e 100644 (file)
@@ -299,7 +299,7 @@ class Mesh(bpy_types.ID):
     @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=()):
         """
index 169e39338bbe0f029473ce035f8b448a23c9834d..715d3610b3183ebd1d4fe9d5884eb31f329f087b 100644 (file)
@@ -1000,12 +1000,7 @@ static float interpolate_particle_value(float v1, float v2, float v3, float v4,
        
        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 @@ void psys_interpolate_particle(short type, ParticleKey keys[4], float dt, Partic
        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);
                        }
                }