diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-22 02:59:32 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-02-22 02:59:32 +0300 |
| commit | 257cf86a05517fd66d65f55c95fc28ec945804a8 (patch) | |
| tree | c5285a39e47d56ef926a91be803685521ef6f2be /intern/cycles/render | |
| parent | 04964ff1f4ef9ad23fa3e6cb0444bf28dd6813b5 (diff) | |
| parent | 5d5c6bb5efee9bd03004845f9b1eee9d43883525 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 4 | ||||
| -rw-r--r-- | intern/cycles/render/osl.cpp | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 48613a9324c..56c9e669a5c 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -3463,7 +3463,7 @@ NODE_DEFINE(ParticleInfoNode) { NodeType* type = NodeType::add("particle_info", create, NodeType::SHADER); - SOCKET_OUT_FLOAT(random, "Index"); + SOCKET_OUT_FLOAT(index, "Index"); SOCKET_OUT_FLOAT(random, "Random"); SOCKET_OUT_FLOAT(age, "Age"); SOCKET_OUT_FLOAT(lifetime, "Lifetime"); @@ -3576,7 +3576,7 @@ NODE_DEFINE(HairInfoNode) SOCKET_OUT_FLOAT(is_strand, "Is Strand"); SOCKET_OUT_FLOAT(intercept, "Intercept"); SOCKET_OUT_FLOAT(thickness, "Thickness"); - SOCKET_OUT_NORMAL(tangent Normal, "Tangent Normal"); + SOCKET_OUT_NORMAL(tangent_normal, "Tangent Normal"); #if 0 /*output for minimum hair width transparency - deactivated */ SOCKET_OUT_FLOAT(fade, "Fade"); #endif diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 5c5ac6e2be9..4d066c89b76 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -233,18 +233,25 @@ void OSLShaderManager::shading_system_init() "glossy", /* PATH_RAY_GLOSSY */ "singular", /* PATH_RAY_SINGULAR */ "transparent", /* PATH_RAY_TRANSPARENT */ + "shadow", /* PATH_RAY_SHADOW_OPAQUE_NON_CATCHER */ "shadow", /* PATH_RAY_SHADOW_OPAQUE_CATCHER */ "shadow", /* PATH_RAY_SHADOW_TRANSPARENT_NON_CATCHER */ "shadow", /* PATH_RAY_SHADOW_TRANSPARENT_CATCHER */ "__unused__", + "volume_scatter", /* PATH_RAY_VOLUME_SCATTER */ + "__unused__", + "__unused__", "diffuse_ancestor", /* PATH_RAY_DIFFUSE_ANCESTOR */ "__unused__", "__unused__", - "__unused__", /* PATH_RAY_SINGLE_PASS_DONE */ - "volume_scatter", /* PATH_RAY_VOLUME_SCATTER */ + "__unused__", + "__unused__", + "__unused__", + "__unused__", + "__unused__", }; const int nraytypes = sizeof(raytypes)/sizeof(raytypes[0]); |