diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-24 15:36:18 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-08-24 15:36:18 +0300 |
commit | 658a9c6cf5228efafd9e7b8d5282f09019f4c4f2 (patch) | |
tree | 05815144ef68abe6d983bd9c8d282406cea074e8 /intern/cycles/kernel/osl | |
parent | e92e90c30e148bf216fbf9829cdc4a7058cfd6f8 (diff) |
Cycles: Cleanup, style
I wouldn't mind changing style to have space after keyword, but there was
no official code style change proposed.
Diffstat (limited to 'intern/cycles/kernel/osl')
-rw-r--r-- | intern/cycles/kernel/osl/osl_bssrdf.cpp | 12 | ||||
-rw-r--r-- | intern/cycles/kernel/osl/osl_closures.cpp | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/intern/cycles/kernel/osl/osl_bssrdf.cpp b/intern/cycles/kernel/osl/osl_bssrdf.cpp index 2ebfd5f0c2f..66ec8a996ca 100644 --- a/intern/cycles/kernel/osl/osl_bssrdf.cpp +++ b/intern/cycles/kernel/osl/osl_bssrdf.cpp @@ -69,22 +69,22 @@ public: void setup(ShaderData *sd, int path_flag, float3 weight) { - if (method == u_cubic) { + if(method == u_cubic) { alloc(sd, path_flag, weight, CLOSURE_BSSRDF_CUBIC_ID); } - else if (method == u_gaussian) { + else if(method == u_gaussian) { alloc(sd, path_flag, weight, CLOSURE_BSSRDF_GAUSSIAN_ID); } - else if (method == u_burley) { + else if(method == u_burley) { alloc(sd, path_flag, weight, CLOSURE_BSSRDF_BURLEY_ID); } - else if (method == u_principled) { + else if(method == u_principled) { alloc(sd, path_flag, weight, CLOSURE_BSSRDF_PRINCIPLED_ID); } - else if (method == u_random_walk) { + else if(method == u_random_walk) { alloc(sd, path_flag, weight, CLOSURE_BSSRDF_RANDOM_WALK_ID); } - else if (method == u_principled_random_walk) { + else if(method == u_principled_random_walk) { alloc(sd, path_flag, weight, CLOSURE_BSSRDF_PRINCIPLED_RANDOM_WALK_ID); } } diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp index 8c7ae30725c..169351d5ad9 100644 --- a/intern/cycles/kernel/osl/osl_closures.cpp +++ b/intern/cycles/kernel/osl/osl_closures.cpp @@ -200,11 +200,9 @@ public: void setup(ShaderData *sd, int path_flag, float3 weight) { - if(!skip(sd, path_flag, LABEL_GLOSSY)) - { + if(!skip(sd, path_flag, LABEL_GLOSSY)) { PrincipledHairBSDF *bsdf = (PrincipledHairBSDF*)alloc(sd, path_flag, weight); - if (!bsdf) - { + if(!bsdf) { return; } |