archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix for [#24430] Hair Dynamics Problem

Browse Source 
* Hair added in particle mode didn't have any weights assigned.
This commit is contained in:
Janne Karhu
2010-10-29 10:31:45 +00:00
parent 6a9a49f8af
commit ce74b14850
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/physics/particle_edit.c
View File

@@ -3200,6 +3200,7 @@ static int brush_add(PEData *data, short number)
framestep= pa->lifetime/(float)(pset->totaddkey-1);
if(tree) {
ParticleData *ppa;
HairKey *hkey;
ParticleKey key[3];
KDTreeNearest ptn[3];
@@ -3224,6 +3225,8 @@ static int brush_add(PEData *data, short number)
for(w=0; w<maxw; w++)
weight[w] /= totw;
ppa= psys->particles+ptn[0].index;
for(k=0; k<pset->totaddkey; k++) {
hkey= (HairKey*)pa->hair + k;
hkey->time= pa->time + k * framestep;
@@ -3232,6 +3235,9 @@ static int brush_add(PEData *data, short number)
psys_get_particle_on_path(&sim, ptn[0].index, key, 0);
mul_v3_fl(key[0].co, weight[0]);
/* TODO: interpolatint the weight would be nicer */
hkey->weight= (ppa->hair+MIN2(k, ppa->totkey-1))->weight;
if(maxw>1) {
key[1].time= key[0].time;
psys_get_particle_on_path(&sim, ptn[1].index, key + 1, 0);
@@ -3258,6 +3264,7 @@ static int brush_add(PEData *data, short number)
for(k=0, hkey=pa->hair; k<pset->totaddkey; k++, hkey++) {
VECADDFAC(hkey->co, pa->state.co, pa->state.vel, k * framestep * timestep);
hkey->time += k * framestep;
hkey->weight = 1.f - (float)k/(float)(pset->totaddkey-1);
}
}
for(k=0, hkey=pa->hair; k<pset->totaddkey; k++, hkey++) {