sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

- bugfix [#20654] the property edge_face_count of the Mesh-Object does not work

Browse Source 
- remove unneeded particle function
This commit is contained in:
Campbell Barton 2010-01-12 18:33:21 +00:00
parent f7f98f3b05
commit 59dfd24f75
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/modules/bpy_types.py
View 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=()):
"""

13
source/blender/blenkernel/intern/particle.c
View 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);
}
}