diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-04-13 15:31:36 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-04-13 15:31:36 +0300 |
| commit | 04d9e286211e1d958ba84f201181d60d35a29755 (patch) | |
| tree | b0ebd3a606e0d388e8ef57166200f6857d2e14f3 /source/blender/blenkernel/intern/particle_system.c | |
| parent | eeb3ccad48612067fd9b94aab91ae711dd763ecc (diff) | |
| parent | 364b6b29ff2ea19a31fdfc8e08b75ce0d46df40b (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenloader/intern/versioning_270.c
Diffstat (limited to 'source/blender/blenkernel/intern/particle_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 1d92c15e6c4..2c1a7a4a7f4 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -929,7 +929,7 @@ void psys_get_birth_coords(ParticleSimulationData *sim, ParticleData *pa, Partic /* rotation phase */ phasefac = part->phasefac; if (part->randphasefac != 0.0f) - phasefac += part->randphasefac * psys_frand(psys, p + 20); + phasefac += part->randphasefac * psys_frand(psys, p + 20) * 2.0f; axis_angle_to_quat( q_phase,x_vec, phasefac*(float)M_PI); /* combine base rotation & phase */ |