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/svm.cpp | |
| 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/svm.cpp')
| -rw-r--r-- | intern/cycles/render/svm.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp index 9cf3f4cb0b2..48287d872d4 100644 --- a/intern/cycles/render/svm.cpp +++ b/intern/cycles/render/svm.cpp @@ -393,13 +393,11 @@ void SVMCompiler::add_node(const float4& f) uint SVMCompiler::attribute(ustring name) { - thread_scoped_spin_lock lock(attribute_lock_); return shader_manager->get_attribute_id(name); } uint SVMCompiler::attribute(AttributeStandard std) { - thread_scoped_spin_lock lock(attribute_lock_); return shader_manager->get_attribute_id(std); } |