From 9a5be1fba99f9f6593cfe7d8ced997d01ee15200 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 20 Feb 2018 14:36:50 +0100 Subject: Fix incorrect OSL raytype bits and add some comments. --- intern/cycles/render/osl.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'intern/cycles/render') diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 5c5ac6e2be9..9c107274305 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -233,18 +233,22 @@ 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__", }; const int nraytypes = sizeof(raytypes)/sizeof(raytypes[0]); -- cgit v1.2.3 From 6a48a9dc6e9c9c38036b90187fae5a2c208946de Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 21 Feb 2018 13:18:40 +0100 Subject: Code cleanup: fix incorrect socket names in hair and particle info nodes. --- intern/cycles/render/nodes.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'intern/cycles/render') 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 -- cgit v1.2.3 From 2d81758aa650256d6b6ed283e43b6c35808ed205 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 20 Feb 2018 14:22:40 +0100 Subject: Cycles: better path termination for transparency. We now continue transparent paths after diffuse/glossy/transmission/volume bounces are exceeded. This avoids unexpected boundaries in volumes with transparent boundaries. It is also required for MIS to work correctly with transparent surfaces, as we also continue through these in shadow rays. The main visible changes is that volumes will now be lit by the background even at volume bounces 0, same as surfaces. Fixes T53914 and T54103. --- intern/cycles/render/osl.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'intern/cycles/render') diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 9c107274305..4d066c89b76 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -249,6 +249,9 @@ void OSLShaderManager::shading_system_init() "__unused__", "__unused__", "__unused__", + "__unused__", + "__unused__", + "__unused__", }; const int nraytypes = sizeof(raytypes)/sizeof(raytypes[0]); -- cgit v1.2.3