[Bf-blender-cvs] [ac226cb] cycles-ptex-49: Ptex+OSL compilation fix, change ifdef guard for older Ptex code

[Nicholas Bishop]

Commit: ac226cb43eaecf3417dc700167d6531a67b3c5a2
Author: Nicholas Bishop
Date:   Mon Feb 9 11:53:27 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rBac226cb43eaecf3417dc700167d6531a67b3c5a2

Ptex+OSL compilation fix, change ifdef guard for older Ptex code

===================================================================

M       intern/cycles/kernel/osl/osl_services.cpp

===================================================================

diff --git a/intern/cycles/kernel/osl/osl_services.cpp 
b/intern/cycles/kernel/osl/osl_services.cpp
index 1f6015d..eddf86c 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;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs