From 6290df0cf477475b8b769b0c0002e81ee70fc929 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Tue, 2 Feb 2016 15:01:58 +0100
Subject: 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.
---
 source/blender/blenkernel/BKE_particle.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source/blender/blenkernel/BKE_particle.h')

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 {
-- 
cgit v1.2.3