diff options
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
-rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index bcd0a0318fb..93eb273fc00 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -3007,6 +3007,7 @@ static void hair_create_input_dm(ParticleSimulationData *sim, int totpoint, int int k, hair_index; float hairmat[4][4]; float max_length; + float hair_radius; dm = *r_dm; if (!dm) { @@ -3034,6 +3035,9 @@ static void hair_create_input_dm(ParticleSimulationData *sim, int totpoint, int psys->clmd->sim_parms->vgroup_mass = 1; + /* XXX placeholder for more flexible future hair settings */ + hair_radius = part->size; + /* make vgroup for pin roots etc.. */ hair_index = 1; LOOP_PARTICLES { @@ -3063,6 +3067,7 @@ static void hair_create_input_dm(ParticleSimulationData *sim, int totpoint, int copy_v3_v3(hair->loc, root_mat[3]); copy_m3_m4(hair->rot, root_mat); + hair->radius = hair_radius; hair->bending_stiffness = bending_stiffness; add_v3_v3v3(mvert->co, co, co); @@ -3083,6 +3088,7 @@ static void hair_create_input_dm(ParticleSimulationData *sim, int totpoint, int copy_v3_v3(hair->loc, root_mat[3]); copy_m3_m4(hair->rot, root_mat); + hair->radius = hair_radius; hair->bending_stiffness = bending_stiffness; copy_v3_v3(mvert->co, co); |