Commit: ba653eb49b2a95ef2c91562656405b31da378002
Author: Nicholas Bishop
Date: Sun Feb 8 19:18:02 2015 +0100
Branches: cycles-ptex-49
https://developer.blender.org/rBba653eb49b2a95ef2c91562656405b31da378002
Fix crash in Ptex+Cycles
- Fix name of CMake option
- Fix path in BPX include
===================================================================
M intern/cycles/CMakeLists.txt
M intern/cycles/render/image.cpp
===================================================================
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index e790012..a893b9d 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -129,7 +129,7 @@ if(WITH_CYCLES_STANDALONE_GUI)
add_definitions(-DWITH_CYCLES_STANDALONE_GUI)
endif()
-if(WITH_CYCLES_PTEX)
+if(WITH_PTEX)
add_definitions(-DWITH_PTEX)
include_directories("../../extern/ptex")
endif()
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 2651c86..144a837 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -28,7 +28,7 @@
#endif
#ifdef WITH_PTEX
-#include "BPX_pack.h"
+#include "BPX_ptex.h"
#endif
CCL_NAMESPACE_BEGIN
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
