diff options
Diffstat (limited to 'intern/cycles/kernel/osl/osl_globals.h')
-rw-r--r-- | intern/cycles/kernel/osl/osl_globals.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/intern/cycles/kernel/osl/osl_globals.h b/intern/cycles/kernel/osl/osl_globals.h index 414aaf891db..51bc5cf81a9 100644 --- a/intern/cycles/kernel/osl/osl_globals.h +++ b/intern/cycles/kernel/osl/osl_globals.h @@ -37,6 +37,7 @@ using std::isfinite; CCL_NAMESPACE_BEGIN class OSLRenderServices; +class ColorSpaceProcessor; /* OSL Texture Handle * @@ -53,21 +54,15 @@ class OSLRenderServices; struct OSLTextureHandle : public OIIO::RefCnt { enum Type { OIIO, SVM, IES, BEVEL, AO }; - OSLTextureHandle() : type(OIIO), svm_slot(-1), oiio_handle(NULL) - { - } - - OSLTextureHandle(Type type) : type(type), svm_slot(-1), oiio_handle(NULL) - { - } - - OSLTextureHandle(Type type, int svm_slot) : type(type), svm_slot(svm_slot), oiio_handle(NULL) + OSLTextureHandle(Type type = OIIO, int svm_slot = -1) + : type(type), svm_slot(svm_slot), oiio_handle(NULL), processor(NULL) { } Type type; int svm_slot; OSL::TextureSystem::TextureHandle *oiio_handle; + ColorSpaceProcessor *processor; }; typedef OIIO::intrusive_ptr<OSLTextureHandle> OSLTextureHandleRef; |