Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source 
Conflicts:
	source/blender/editors/space_view3d/drawobject.c
This commit is contained in:
Bastien Montagne
2017-04-10 17:34:31 +02:00
parent 5f70116030 2ad1124372
commit 45f3150c98
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/render/shader.cpp
View File

@@ -332,6 +332,8 @@ ShaderManager *ShaderManager::create(Scene *scene, int shadingsystem)
uint ShaderManager::get_attribute_id(ustring name)
{
thread_scoped_spin_lock lock(attribute_lock_);
/* get a unique id for each name, for SVM attribute lookup */
AttributeIDMap::iterator it = unique_attribute_id.find(name);

2
intern/cycles/render/shader.h
View File

@@ -202,6 +202,8 @@ protected:
void get_requested_graph_features(ShaderGraph *graph,
DeviceRequestedFeatures *requested_features);
thread_spin_lock attribute_lock_;
};
CCL_NAMESPACE_END

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

@@ -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);
}

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

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

12
source/blender/editors/space_view3d/drawobject.c
View File

@@ -1907,14 +1907,14 @@ static void drawcamera_volume(float near_plane[4][3], float far_plane[4][3], boo
immVertex3fv(pos, near_plane[2]);
immVertex3fv(pos, near_plane[2]);
immVertex3fv(pos, near_plane[1]);
immVertex3fv(pos, far_plane[1]);
immVertex3fv(pos, far_plane[2]);
immVertex3fv(pos, far_plane[0]);
immVertex3fv(pos, near_plane[0]);
immVertex3fv(pos, near_plane[3]);
immVertex3fv(pos, far_plane[3]);
immVertex3fv(pos, near_plane[3]);
immVertex3fv(pos, far_plane[3]);
immVertex3fv(pos, near_plane[3]);
immVertex3fv(pos, near_plane[0]);
immVertex3fv(pos, far_plane[0]);
immEnd();
#endif
}