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

Fix for unfreed effector weights in hair dynamics.

Browse Source 
The internal cloth modifier effector weights get replaced temporarily
to make the cloth sim use the particle weight settings instead. But
the particle sim was not putting back the original weights, which can be
non-NULL in case the cloth sim allocated these already. Messy design ...
This commit is contained in:
Lukas Tönne 2015-02-02 14:09:02 +01:00
parent 159124726e
commit 14755dde97
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/particle_system.c
View File

@ -3116,6 +3116,7 @@ static void do_hair_dynamics(ParticleSimulationData *sim)
{
ParticleSystem *psys = sim->psys;
PARTICLE_P;
EffectorWeights *clmd_effweights;
int totpoint;
int totedge;
float (*deformedVerts)[3];
@ -3162,6 +3163,10 @@ static void do_hair_dynamics(ParticleSimulationData *sim)
psys->hair_out_dm->release(psys->hair_out_dm);
psys->clmd->point_cache = psys->pointcache;
/* for hair sim we replace the internal cloth effector weights temporarily
* to use the particle settings
*/
clmd_effweights = psys->clmd->sim_parms->effector_weights;
psys->clmd->sim_parms->effector_weights = psys->part->effector_weights;
deformedVerts = MEM_mallocN(sizeof(*deformedVerts) * psys->hair_in_dm->getNumVerts(psys->hair_in_dm), "do_hair_dynamics vertexCos");
@ -3174,7 +3179,8 @@ static void do_hair_dynamics(ParticleSimulationData *sim)
MEM_freeN(deformedVerts);
psys->clmd->sim_parms->effector_weights = NULL;
/* restore cloth effector weights */
psys->clmd->sim_parms->effector_weights = clmd_effweights;
}
static void hair_step(ParticleSimulationData *sim, float cfra)
{