Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-04-21 08:53:32 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-04-21 08:53:32 +0300
commitb82d571c85abe3e7631d2966115dcae2bb076be6 (patch)
tree3dd5e7a7e5b41d0d8c90aa7426a16c6ba3c07173 /intern/cycles/kernel
parentf36e91ad0af2aa6c474f476d0a27fd30f42d45ab (diff)
Cleanup: style
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r--intern/cycles/kernel/shaders/node_image_texture.osl6
-rw-r--r--intern/cycles/kernel/shaders/node_math.osl4
2 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/kernel/shaders/node_image_texture.osl b/intern/cycles/kernel/shaders/node_image_texture.osl
index 526a87525cd..46a02cab32e 100644
--- a/intern/cycles/kernel/shaders/node_image_texture.osl
+++ b/intern/cycles/kernel/shaders/node_image_texture.osl
@@ -26,7 +26,7 @@ point map_to_tube(vector dir)
{
float u, v;
v = (dir[2] + 1.0) * 0.5;
- float len = sqrt(dir[0]*dir[0] + dir[1]*dir[1]);
+ float len = sqrt(dir[0] * dir[0] + dir[1] * dir[1]);
if (len > 0.0) {
u = (1.0 - (atan2(dir[0] / len, dir[1] / len) / M_PI)) * 0.5;
}
@@ -40,8 +40,8 @@ point map_to_sphere(vector dir)
{
float len = length(dir);
float v, u;
- if(len > 0.0) {
- if(dir[0] == 0.0 && dir[1] == 0.0) {
+ if (len > 0.0) {
+ if (dir[0] == 0.0 && dir[1] == 0.0) {
u = 0.0; /* Othwise domain error. */
}
else {
diff --git a/intern/cycles/kernel/shaders/node_math.osl b/intern/cycles/kernel/shaders/node_math.osl
index bbc008b4299..7eef97fd7e8 100644
--- a/intern/cycles/kernel/shaders/node_math.osl
+++ b/intern/cycles/kernel/shaders/node_math.osl
@@ -93,8 +93,8 @@ shader node_math(
Value = Value1 > Value2;
else if (type == "Modulo")
Value = safe_modulo(Value1, Value2);
- else if (type == "Absolute")
- Value = fabs(Value1);
+ else if (type == "Absolute")
+ Value = fabs(Value1);
if (Clamp)
Value = clamp(Value, 0.0, 1.0);