archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Style cleanup: indentation, braces

Browse Source
This commit is contained in:
Campbell Barton
2014-05-05 02:19:08 +10:00
parent e86dbf6877
commit dc13969e48
45 changed files with 130 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,7 +226,8 @@ void SVMCompiler::stack_assign(ShaderInput *input)
else if(input->type == SHADER_SOCKET_VECTOR ||
input->type == SHADER_SOCKET_NORMAL ||
input->type == SHADER_SOCKET_POINT ||
input->type == SHADER_SOCKET_COLOR) {
input->type == SHADER_SOCKET_COLOR)
{
add_node(NODE_VALUE_V, input->stack_offset);
add_node(NODE_VALUE_V, input->value);
@@ -506,8 +507,8 @@ void SVMCompiler::generate_multi_closure(ShaderNode *node, set<ShaderNode*>& don
find_dependencies(cl2deps, done, cl2in);
set_intersection(cl1deps.begin(), cl1deps.end(),
cl2deps.begin(), cl2deps.end(),
std::inserter(shareddeps, shareddeps.begin()));
cl2deps.begin(), cl2deps.end(),
std::inserter(shareddeps, shareddeps.begin()));
if(!shareddeps.empty()) {
if(cl1in->link)