ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cycles: Fix race condition in attributes creation during SVM compilation

Browse source
This commit is contained in:
Sergey Sharybin 2017-04-05 14:57:54 +02:00
parent 3ce30823ff
commit 52029e689c
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
intern/cycles/render/svm.cpp
View file

@ -393,11 +393,13 @@ 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);
}

2
intern/cycles/render/svm.h
View file

@ -218,6 +218,8 @@ protected:
int max_stack_use;
uint mix_weight_offset;
bool compile_failed;
thread_spin_lock attribute_lock_;
};
CCL_NAMESPACE_END