diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-09-29 20:04:34 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-09-29 20:04:34 +0400 |
| commit | 927099ceb843403a7b3b2487696adbdcaa5807a5 (patch) | |
| tree | 1d98afb48af89623866c51d04feaeb6758bbc90e /intern | |
| parent | ec8fb6dbef967424660598f602f395e1eabbad0f (diff) | |
Cleanup: style
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_brick_texture.osl | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/shaders/node_fresnel.h | 6 | ||||
| -rw-r--r-- | intern/cycles/kernel/shaders/node_geometry.osl | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/kernel/shaders/node_brick_texture.osl b/intern/cycles/kernel/shaders/node_brick_texture.osl index 70a6a6ea7ce..c9fb3542aef 100644 --- a/intern/cycles/kernel/shaders/node_brick_texture.osl +++ b/intern/cycles/kernel/shaders/node_brick_texture.osl @@ -93,6 +93,6 @@ shader node_brick_texture( Col[2] = facm * (Color1[2]) + tint * Color2[2]; } - Color = (Fac == 1.0) ? Mortar: Col; + Color = (Fac == 1.0) ? Mortar : Col; } diff --git a/intern/cycles/kernel/shaders/node_fresnel.h b/intern/cycles/kernel/shaders/node_fresnel.h index 9f10ba8023e..d192c5d02de 100644 --- a/intern/cycles/kernel/shaders/node_fresnel.h +++ b/intern/cycles/kernel/shaders/node_fresnel.h @@ -36,14 +36,14 @@ float fresnel_dielectric_cos(float cosi, float eta) color fresnel_conductor(float cosi, color eta, color k) { - color cosi2 = color(cosi*cosi); + color cosi2 = color(cosi * cosi); color one = color(1, 1, 1); color tmp_f = eta * eta + k * k; color tmp = tmp_f * cosi2; color Rparl2 = (tmp - (2.0 * eta * cosi) + one) / - (tmp + (2.0 * eta * cosi) + one); + (tmp + (2.0 * eta * cosi) + one); color Rperp2 = (tmp_f - (2.0 * eta * cosi) + cosi2) / - (tmp_f + (2.0 * eta * cosi) + cosi2); + (tmp_f + (2.0 * eta * cosi) + cosi2); return (Rparl2 + Rperp2) * 0.5; } diff --git a/intern/cycles/kernel/shaders/node_geometry.osl b/intern/cycles/kernel/shaders/node_geometry.osl index 7bef2051865..cd68f07b21e 100644 --- a/intern/cycles/kernel/shaders/node_geometry.osl +++ b/intern/cycles/kernel/shaders/node_geometry.osl @@ -49,7 +49,7 @@ shader node_geometry( /* try to create spherical tangent from generated coordinates */ if (getattribute("geom:generated", generated)) { - normal data = normal(-(generated[1]-0.5), (generated[0]-0.5), 0.0); + normal data = normal(-(generated[1] - 0.5), (generated[0] - 0.5), 0.0); vector T = transform("object", "world", data); Tangent = cross(Normal, normalize(cross(T, Normal))); } |