Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix for OSL 'Normal' node: the Direction parameter is of 'normal' type instead of generic 'vector'.

Browse Source
This commit is contained in:
Lukas Toenne
2012-09-15 16:31:11 +00:00
parent 41081b3e8c
commit f4b7a8a545
2 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/render/nodes.cpp
View File

@@ -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");
}

32
intern/cycles/render/osl.cpp
View File

@@ -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