diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-29 05:09:24 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-11-29 07:01:07 +0400 |
| commit | 746628e0d021fa616c69e9ff0ef9ad71cba23694 (patch) | |
| tree | 4ca4b0e2d1aae189bc06df1a0b652ec5280a37aa /intern/cycles/kernel/osl/osl_bssrdf.h | |
| parent | aa3933b411fc61d673facc6ea6f8cce6d86a3c6c (diff) | |
Cycles OSL: refactoring to remove all dependencies on builtin OSL closures.
These were removed in new OSL versions. We only used these as base classes,
not using them at all simplifies the code a bit.
Diffstat (limited to 'intern/cycles/kernel/osl/osl_bssrdf.h')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_bssrdf.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/osl/osl_bssrdf.h b/intern/cycles/kernel/osl/osl_bssrdf.h index fc1a4c587cc..6aee2c28ea8 100644 --- a/intern/cycles/kernel/osl/osl_bssrdf.h +++ b/intern/cycles/kernel/osl/osl_bssrdf.h @@ -37,20 +37,20 @@ #include <OSL/oslexec.h> #include <OSL/genclosure.h> +#include "osl_closures.h" + #include "kernel_types.h" #include "util_types.h" CCL_NAMESPACE_BEGIN -class CBSSRDFClosure : public OSL::ClosurePrimitive { +class CBSSRDFClosure : public CClosurePrimitive { public: ShaderClosure sc; float3 radius; - CBSSRDFClosure() : OSL::ClosurePrimitive(BSSRDF) { memset(&sc, 0, sizeof(sc)); } - ~CBSSRDFClosure() { } - + CBSSRDFClosure() : CClosurePrimitive(BSSRDF) { } int scattering() const { return LABEL_DIFFUSE; } }; |