diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-04 20:19:08 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-04 20:19:08 +0400 |
| commit | dc13969e484ed9fa6834b1aba85ba00f65bf8a11 (patch) | |
| tree | affc2efd3e5c8637fbfcaf0b3be87a78781876b9 /intern/cycles/render | |
| parent | e86dbf687769a7f38ab465c89d1111a8be691ca2 (diff) | |
Style cleanup: indentation, braces
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/curves.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/render/mesh.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/render/svm.cpp | 7 |
4 files changed, 7 insertions, 6 deletions
diff --git a/intern/cycles/render/curves.cpp b/intern/cycles/render/curves.cpp index 6e6b11ca92f..2c96ffa655e 100644 --- a/intern/cycles/render/curves.cpp +++ b/intern/cycles/render/curves.cpp @@ -110,7 +110,7 @@ void CurveSystemManager::device_update(Device *device, DeviceScene *dscene, Scen progress.set_status("Updating Hair settings", "Copying Hair settings to device"); - KernelCurves *kcurve= &dscene->data.curve; + KernelCurves *kcurve = &dscene->data.curve; kcurve->curveflags = 0; diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index ddcc42a9ae9..9607892ceb8 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -554,7 +554,7 @@ bool Mesh::has_motion_blur() const { return (use_motion_blur && (attributes.find(ATTR_STD_MOTION_VERTEX_POSITION) || - curve_attributes.find(ATTR_STD_MOTION_VERTEX_POSITION))); + curve_attributes.find(ATTR_STD_MOTION_VERTEX_POSITION))); } /* Mesh Manager */ diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 8748294acb0..28d2a41a113 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -317,7 +317,7 @@ void ImageTextureNode::compile(OSLCompiler& compiler) compiler.parameter("is_float", is_float); compiler.parameter("use_alpha", !alpha_out->links.empty()); - switch (interpolation){ + switch (interpolation) { case INTERPOLATION_CLOSEST: compiler.parameter("interpolation", "closest"); break; diff --git a/intern/cycles/render/svm.cpp b/intern/cycles/render/svm.cpp index db80aad74d4..576c176759c 100644 --- a/intern/cycles/render/svm.cpp +++ b/intern/cycles/render/svm.cpp @@ -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) |