diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-10 17:53:01 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-04-10 17:53:01 +0300 |
| commit | c8e764ccbf3a19df143601fb2391fea2f9839581 (patch) | |
| tree | 798d4abe4b733e745dcb7f19e8af7020e6a4cdd1 /intern/cycles/render/shader.h | |
| parent | fd203a09330ce88725e8c5c8d9b1f9ce7b2f3c10 (diff) | |
Cycles: Fix race condition in shader attribute for real now
Ended up moving lock in the more centralized space since multiple shaders
can access this map.
Diffstat (limited to 'intern/cycles/render/shader.h')
| -rw-r--r-- | intern/cycles/render/shader.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h index 87fef19c592..a8018231f1a 100644 --- a/intern/cycles/render/shader.h +++ b/intern/cycles/render/shader.h @@ -202,6 +202,8 @@ protected: void get_requested_graph_features(ShaderGraph *graph, DeviceRequestedFeatures *requested_features); + + thread_spin_lock attribute_lock_; }; CCL_NAMESPACE_END |