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:
authorLukas Toenne <lukas.toenne@googlemail.com>2012-09-15 20:31:11 +0400
committerLukas Toenne <lukas.toenne@googlemail.com>2012-09-15 20:31:11 +0400
commitf4b7a8a545e7b65da52fec2a244f46c23d6057f3 (patch)
treed8159606b96809c29ce1ff7896af5e782d83efd5 /intern/cycles
parent41081b3e8cd0f5f80f7753ad600db64b93a4d9b5 (diff)
Fix for OSL 'Normal' node: the Direction parameter is of 'normal' type instead of generic 'vector'.
Diffstat (limited to 'intern/cycles')
-rw-r--r--intern/cycles/render/nodes.cpp2
-rw-r--r--intern/cycles/render/osl.cpp32
2 files changed, 33 insertions, 1 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 1acb6795aca..eabb97e7238 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -1021,7 +1021,7 @@ void NormalNode::compile(SVMCompiler& compiler)
void NormalNode::compile(OSLCompiler& compiler)
{
- compiler.parameter_vector("Direction", direction);
+ compiler.parameter_normal("Direction", direction);
compiler.add(this, "node_normal");
}
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index 39d04814d33..b104135b38d 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -589,6 +589,38 @@ void OSLCompiler::parameter(const char *name, const Transform& tfm)
{
}
+void OSLCompiler::parameter_array(const char *name, const float f[], int arraylen)
+{
+}
+
+void OSLCompiler::parameter_color_array(const char *name, const float f[][3], int arraylen)
+{
+}
+
+void OSLCompiler::parameter_vector_array(const char *name, const float f[][3], int arraylen)
+{
+}
+
+void OSLCompiler::parameter_normal_array(const char *name, const float f[][3], int arraylen)
+{
+}
+
+void OSLCompiler::parameter_point_array(const char *name, const float f[][3], int arraylen)
+{
+}
+
+void OSLCompiler::parameter_array(const char *name, const int f[], int arraylen)
+{
+}
+
+void OSLCompiler::parameter_array(const char *name, const char * const s[], int arraylen)
+{
+}
+
+void OSLCompiler::parameter_array(const char *name, const Transform tfm[], int arraylen)
+{
+}
+
#endif /* WITH_OSL */
CCL_NAMESPACE_END