Blender Git Loki
Git Commits -> Revision 858c714
Revision 858c714 by Nicholas Bishop (cycles-ptex-49) February 8, 2015, 01:04 (GMT) |
Move some of the Ptex code behind a WITH_PTEX ifdef Can be set via WITH_PTEX in CMake or WITH_BF_PTEX in SCons. Not well tested yet. |
Commit Details:
Full Hash: 858c714d3fe9756e0cc587068a45bbe8ba9068ee
Parent Commit: 3bba36a
Lines Changed: +252, -148
21 Modified Paths:
/build_files/cmake/config/blender_lite.cmake (+1, -0) (Diff)
/build_files/scons/config/darwin-config.py (+2, -0) (Diff)
/build_files/scons/config/linux-config.py (+2, -0) (Diff)
/build_files/scons/config/win32-mingw-config.py (+2, -0) (Diff)
/build_files/scons/config/win32-vc-config.py (+2, -0) (Diff)
/build_files/scons/config/win64-mingw-config.py (+2, -0) (Diff)
/build_files/scons/config/win64-vc-config.py (+2, -0) (Diff)
/build_files/scons/tools/btools.py (+3, -1) (Diff)
/CMakeLists.txt (+2, -0) (Diff)
/extern/CMakeLists.txt (+2, -2) (Diff)
/extern/ptex/SConscript (+5, -2) (Diff)
/extern/SConscript (+3, -2) (Diff)
/intern/cycles/CMakeLists.txt (+2, -2) (Diff)
/intern/cycles/render/image.cpp (+17, -0) (Diff)
/intern/cycles/SConscript (+5, -2) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+4, -0) (Diff)
/source/blender/blenkernel/intern/bke_ptex.c (+172, -131) (Diff)
/source/blender/blenkernel/SConscript (+4, -1) (Diff)
/source/blender/imbuf/CMakeLists.txt (+12, -2) (Diff)
/source/blender/imbuf/intern/filetype.c (+2, -2) (Diff)
/source/blender/imbuf/SConscript (+6, -1) (Diff)
/build_files/scons/config/darwin-config.py (+2, -0) (Diff)
/build_files/scons/config/linux-config.py (+2, -0) (Diff)
/build_files/scons/config/win32-mingw-config.py (+2, -0) (Diff)
/build_files/scons/config/win32-vc-config.py (+2, -0) (Diff)
/build_files/scons/config/win64-mingw-config.py (+2, -0) (Diff)
/build_files/scons/config/win64-vc-config.py (+2, -0) (Diff)
/build_files/scons/tools/btools.py (+3, -1) (Diff)
/CMakeLists.txt (+2, -0) (Diff)
/extern/CMakeLists.txt (+2, -2) (Diff)
/extern/ptex/SConscript (+5, -2) (Diff)
/extern/SConscript (+3, -2) (Diff)
/intern/cycles/CMakeLists.txt (+2, -2) (Diff)
/intern/cycles/render/image.cpp (+17, -0) (Diff)
/intern/cycles/SConscript (+5, -2) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+4, -0) (Diff)
/source/blender/blenkernel/intern/bke_ptex.c (+172, -131) (Diff)
/source/blender/blenkernel/SConscript (+4, -1) (Diff)
/source/blender/imbuf/CMakeLists.txt (+12, -2) (Diff)
/source/blender/imbuf/intern/filetype.c (+2, -2) (Diff)
/source/blender/imbuf/SConscript (+6, -1) (Diff)