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 <campbell@blender.org>2022-05-05 10:32:57 +0300
committerCampbell Barton <campbell@blender.org>2022-05-05 10:33:43 +0300
commiteb837ba17eb5bc53de98972ab1f0b9aa30658e19 (patch)
tree4cd67ec9ef1aa00f0e4a3bb0622e1730df00c41e /intern/cycles/kernel/osl/shaders
parent6513ce258f734f50fa152a8f88240368e176389b (diff)
Cleanup: format
Diffstat (limited to 'intern/cycles/kernel/osl/shaders')
-rw-r--r--intern/cycles/kernel/osl/shaders/node_combine_color.osl6
-rw-r--r--intern/cycles/kernel/osl/shaders/node_separate_color.osl8
2 files changed, 9 insertions, 5 deletions
diff --git a/intern/cycles/kernel/osl/shaders/node_combine_color.osl b/intern/cycles/kernel/osl/shaders/node_combine_color.osl
index 94d624d82ad..681a592d2bb 100644
--- a/intern/cycles/kernel/osl/shaders/node_combine_color.osl
+++ b/intern/cycles/kernel/osl/shaders/node_combine_color.osl
@@ -3,7 +3,11 @@
#include "stdcycles.h"
-shader node_combine_color(string color_type = "rgb", float Red = 0.0, float Green = 0.0, float Blue = 0.0, output color Color = 0.8)
+shader node_combine_color(string color_type = "rgb",
+ float Red = 0.0,
+ float Green = 0.0,
+ float Blue = 0.0,
+ output color Color = 0.8)
{
if (color_type == "rgb" || color_type == "hsv" || color_type == "hsl")
Color = color(color_type, Red, Green, Blue);
diff --git a/intern/cycles/kernel/osl/shaders/node_separate_color.osl b/intern/cycles/kernel/osl/shaders/node_separate_color.osl
index cba2d85da05..6f3e3149d8e 100644
--- a/intern/cycles/kernel/osl/shaders/node_separate_color.osl
+++ b/intern/cycles/kernel/osl/shaders/node_separate_color.osl
@@ -5,10 +5,10 @@
#include "stdcycles.h"
shader node_separate_color(string color_type = "rgb",
- color Color = 0.8,
- output float Red = 0.0,
- output float Green = 0.0,
- output float Blue = 0.0)
+ color Color = 0.8,
+ output float Red = 0.0,
+ output float Green = 0.0,
+ output float Blue = 0.0)
{
color col;
if (color_type == "rgb")