Blender Git Loki
Git Commits -> Revision 2be851c
May 21, 2010, 03:25 (GMT) |
Blender TIFF support * Removed dynamic linking libTIFF code and change it to static linking (built into the blender executable). Dynamic linking made things a fair bit more complicated and wasn't working at all before on OS X - the dylib didn't exist and wasn't being copied. Since TIFF is more heavily depended upon now in Blender, it makes sense to make it less 'optional' and more in line with other libraries. I've updated both CMake and scons, and CMake on OS X/64bit works fine. It's now up to other platform/build system maintainers to enable this for their respective platforms (Campbell will check it for linux). For windows, and non-64bit osx, we need static libtiff libraries in /lib. I've added options WITH_TIFF for CMake and WITH_BF_TIFF for scons, so if blender won't build because of this, you should be able to disable these options until your build system has been updated. * Bonus feature: while doing this, I added support for loading 16bit and 32bit per channel TIFFs - they get converted to Blender's float buffers. Handy for zbrush displacement maps! |
Commit Details:
Full Hash: 2be851c9665caab9e858f4c06ec59e7bb4201e17
SVN Revision: 28897
Parent Commit: e8ed1f1
Lines Changed: +338, -419
2 Deleted Paths:
/source/blender/imbuf/intern/dynlibtiff.c (+0, -280)
/source/blender/imbuf/intern/dynlibtiff.h (+0, -59)
/source/blender/imbuf/intern/dynlibtiff.h (+0, -59)
29 Modified Paths:
/CMake/macros.cmake (+6, -0) (Diff)
/CMakeLists.txt (+5, -0) (Diff)
/config/darwin-config.py (+3, -0) (Diff)
/config/linux2-config.py (+2, -0) (Diff)
/config/win32-mingw-config.py (+1, -0) (Diff)
/config/win32-vc-config.py (+1, -0) (Diff)
/config/win64-vc-config.py (+1, -0) (Diff)
/source/blender/blenkernel/BKE_global.h (+0, -3) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+4, -0) (Diff)
/source/blender/blenkernel/intern/image.c (+6, -2) (Diff)
/source/blender/blenkernel/SConscript (+3, -0) (Diff)
/source/blender/editors/CMakeLists.txt (+4, -0) (Diff)
/source/blender/editors/space_file/SConscript (+4, -0) (Diff)
/source/blender/editors/space_file/writeimage.c (+3, -2) (Diff)
/source/blender/editors/space_image/image_ops.c (+2, -1) (Diff)
/source/blender/editors/space_image/SConscript (+2, -0) (Diff)
/source/blender/imbuf/CMakeLists.txt (+5, -1) (Diff)
/source/blender/imbuf/intern/filetype.c (+3, -3) (Diff)
/source/blender/imbuf/intern/tiff.c (+245, -62) (Diff)
/source/blender/imbuf/intern/util.c (+10, -3) (Diff)
/source/blender/imbuf/SConscript (+3, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+4, -0) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+3, -1) (Diff)
/source/blender/makesrna/SConscript (+3, -0) (Diff)
/source/creator/CMakeLists.txt (+4, -1) (Diff)
/source/creator/creator.c (+2, -0) (Diff)
/source/creator/SConscript (+3, -0) (Diff)
/tools/Blender.py (+4, -0) (Diff)
/tools/btools.py (+2, -1) (Diff)
/CMakeLists.txt (+5, -0) (Diff)
/config/darwin-config.py (+3, -0) (Diff)
/config/linux2-config.py (+2, -0) (Diff)
/config/win32-mingw-config.py (+1, -0) (Diff)
/config/win32-vc-config.py (+1, -0) (Diff)
/config/win64-vc-config.py (+1, -0) (Diff)
/source/blender/blenkernel/BKE_global.h (+0, -3) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+4, -0) (Diff)
/source/blender/blenkernel/intern/image.c (+6, -2) (Diff)
/source/blender/blenkernel/SConscript (+3, -0) (Diff)
/source/blender/editors/CMakeLists.txt (+4, -0) (Diff)
/source/blender/editors/space_file/SConscript (+4, -0) (Diff)
/source/blender/editors/space_file/writeimage.c (+3, -2) (Diff)
/source/blender/editors/space_image/image_ops.c (+2, -1) (Diff)
/source/blender/editors/space_image/SConscript (+2, -0) (Diff)
/source/blender/imbuf/CMakeLists.txt (+5, -1) (Diff)
/source/blender/imbuf/intern/filetype.c (+3, -3) (Diff)
/source/blender/imbuf/intern/tiff.c (+245, -62) (Diff)
/source/blender/imbuf/intern/util.c (+10, -3) (Diff)
/source/blender/imbuf/SConscript (+3, -0) (Diff)
/source/blender/makesrna/intern/CMakeLists.txt (+4, -0) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+3, -1) (Diff)
/source/blender/makesrna/SConscript (+3, -0) (Diff)
/source/creator/CMakeLists.txt (+4, -1) (Diff)
/source/creator/creator.c (+2, -0) (Diff)
/source/creator/SConscript (+3, -0) (Diff)
/tools/Blender.py (+4, -0) (Diff)
/tools/btools.py (+2, -1) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021