diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-09 13:53:27 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2015-02-09 13:53:27 +0300 |
| commit | ac226cb43eaecf3417dc700167d6531a67b3c5a2 (patch) | |
| tree | 46914aed82f5e3a57acdf55cb83ecba5141e18df /intern/cycles | |
| parent | ef605fd7f029ebe2cb7dba54584b2406f246fe78 (diff) | |
Ptex+OSL compilation fix, change ifdef guard for older Ptex code
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_services.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp index 1f6015d0d6b..eddf86ca5c5 100644 --- a/intern/cycles/kernel/osl/osl_services.cpp +++ b/intern/cycles/kernel/osl/osl_services.cpp @@ -50,7 +50,7 @@ #include "kernel_accumulate.h" #include "kernel_shader.h" -#ifdef WITH_PTEX +#ifdef WITH_PTEX_OSL #include <Ptexture.h> #endif @@ -115,7 +115,7 @@ OSLRenderServices::OSLRenderServices() kernel_globals = NULL; osl_ts = NULL; -#ifdef WITH_PTEX +#ifdef WITH_PTEX_OSL size_t maxmem = 16384 * 1024; ptex_cache = PtexCache::create(0, maxmem); #endif @@ -123,7 +123,7 @@ OSLRenderServices::OSLRenderServices() OSLRenderServices::~OSLRenderServices() { -#ifdef WITH_PTEX +#ifdef WITH_PTEX_OSL ptex_cache->release(); #endif } @@ -848,7 +848,7 @@ bool OSLRenderServices::texture(ustring filename, TextureOpt &options, ShaderData *sd = (ShaderData *)(sg->renderstate); KernelGlobals *kg = sd->osl_globals; -#ifdef WITH_PTEX +#ifdef WITH_PTEX_OSL /* todo: this is just a quick hack, only works with particular files and options */ if(string_endswith(filename.string(), ".ptx")) { float2 uv; |