[Bf-blender-cvs] [67eeab0] cycles-ptex-06: Add a top-level header for extern/ptex

Nicholas Bishop noreply at git.blender.org
Fri Jan 16 12:54:37 CET 2015


Commit: 67eeab08fe46ca128b8735f802e4356e1d7cf08c
Author: Nicholas Bishop
Date:   Fri Jan 16 12:27:41 2015 +0100
Branches: cycles-ptex-06
https://developer.blender.org/rB67eeab08fe46ca128b8735f802e4356e1d7cf08c

Add a top-level header for extern/ptex

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

M	extern/ptex/CMakeLists.txt
A	extern/ptex/bl_ptex.h

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

diff --git a/extern/ptex/CMakeLists.txt b/extern/ptex/CMakeLists.txt
index 7e7bcd0..47da6cc 100644
--- a/extern/ptex/CMakeLists.txt
+++ b/extern/ptex/CMakeLists.txt
@@ -24,12 +24,15 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
+	.
 )
 
 set(INC_SYS
 )
 
 set(SRC
+	bl_ptex.h
+
 	src/ptex/PtexCache.h
 	src/ptex/PtexDict.h
 	src/ptex/PtexHalf.h
diff --git a/extern/ptex/bl_ptex.h b/extern/ptex/bl_ptex.h
new file mode 100644
index 0000000..c2418cb
--- /dev/null
+++ b/extern/ptex/bl_ptex.h
@@ -0,0 +1,4 @@
+// Silence warning
+#define NEW_API 0
+
+#include "src/ptex/Ptexture.h"




More information about the Bf-blender-cvs mailing list