diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-02 17:01:58 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-02 17:01:58 +0300 |
| commit | 6290df0cf477475b8b769b0c0002e81ee70fc929 (patch) | |
| tree | 129ff40bde4e31632a6d5df88b13b05dff6eed4a /source/blender/blenkernel/BKE_particle.h | |
| parent | 4ceea37db4857c3d87624b15087c5dde5261311d (diff) | |
Fix T46382: Crash sharing particle system with clump or rough curves
Made those curves local to thread evaluation now, so there is no
threading conflict accessing them from evaluation threads anymore.
Diffstat (limited to 'source/blender/blenkernel/BKE_particle.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_particle.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h index 7ea27fd8094..b6b40ad081d 100644 --- a/source/blender/blenkernel/BKE_particle.h +++ b/source/blender/blenkernel/BKE_particle.h @@ -156,6 +156,9 @@ typedef struct ParticleThreadContext { float *vg_length, *vg_clump, *vg_kink; float *vg_rough1, *vg_rough2, *vg_roughe; float *vg_effector; + + struct CurveMapping *clumpcurve; + struct CurveMapping *roughcurve; } ParticleThreadContext; typedef struct ParticleTask { |