Commit: 927099ceb843403a7b3b2487696adbdcaa5807a5
Author: Campbell Barton
Date: Tue Sep 30 02:04:34 2014 +1000
Branches: master
https://developer.blender.org/rB927099ceb843403a7b3b2487696adbdcaa5807a5
Cleanup: style
===================================================================
M intern/cycles/kernel/shaders/node_brick_texture.osl
M intern/cycles/kernel/shaders/node_fresnel.h
M intern/cycles/kernel/shaders/node_geometry.osl
M release/scripts/templates_osl/fresnel_conductive.osl
===================================================================
diff --git a/intern/cycles/kernel/shaders/node_brick_texture.osl
b/intern/cycles/kernel/shaders/node_brick_texture.osl
index 70a6a6e..c9fb354 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 9f10ba8..d192c5d 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 7bef205..cd68f07 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)));
}
diff --git a/release/scripts/templates_osl/fresnel_conductive.osl
b/release/scripts/templates_osl/fresnel_conductive.osl
index c197656..6de0692 100644
--- a/release/scripts/templates_osl/fresnel_conductive.osl
+++ b/release/scripts/templates_osl/fresnel_conductive.osl
@@ -16,14 +16,14 @@
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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
