diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2011-01-15 15:00:15 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2011-01-15 15:00:15 +0300 |
| commit | 7297169a7491c85e9bdb9d9c80aaa54fce587232 (patch) | |
| tree | 1063be64adfc4c1e663f68b0d64f6d46dc11d3d2 /source/blender/blenkernel/intern/particle.c | |
| parent | 69c582a3d401e7a143a26d8d66597f003bffbda0 (diff) | |
Fix for [#25637] curveguide forcefield(Kink: Braid) + particlesystem cause crash by Null Pointer in some cases
* Missing null pointer check.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 7c3e90dc375..5526edf0a8c 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -1962,8 +1962,10 @@ static void do_kink(ParticleKey *state, ParticleKey *par, float *par_rot, float float vec_one[3], radius, state_co[3]; float inp_y, inp_z, length; - mul_qt_v3(par_rot, y_vec); - mul_qt_v3(par_rot, z_vec); + if(par_rot) { + mul_qt_v3(par_rot, y_vec); + mul_qt_v3(par_rot, z_vec); + } mul_v3_fl(par_vec, -1.f); radius= normalize_v3_v3(vec_one, par_vec); |