Blender TIFF support
authorMatt Ebb <matt@mke3.net>
Fri, 21 May 2010 03:25:38 +0000 (03:25 +0000)
committerMatt Ebb <matt@mke3.net>
Fri, 21 May 2010 03:25:38 +0000 (03:25 +0000)
commit2be851c9665caab9e858f4c06ec59e7bb4201e17
treeb7c27c3ae46813520ffe9e84f13739243d3ced27
parente8ed1f1f557bb469bfc277448d2ee833e4867086
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!
31 files changed:
CMake/macros.cmake
CMakeLists.txt
config/darwin-config.py
config/linux2-config.py
config/win32-mingw-config.py
config/win32-vc-config.py
config/win64-vc-config.py
source/blender/blenkernel/BKE_global.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/image.c
source/blender/editors/CMakeLists.txt
source/blender/editors/space_file/SConscript
source/blender/editors/space_file/writeimage.c
source/blender/editors/space_image/SConscript
source/blender/editors/space_image/image_ops.c
source/blender/imbuf/CMakeLists.txt
source/blender/imbuf/SConscript
source/blender/imbuf/intern/dynlibtiff.c [deleted file]
source/blender/imbuf/intern/dynlibtiff.h [deleted file]
source/blender/imbuf/intern/filetype.c
source/blender/imbuf/intern/tiff.c
source/blender/imbuf/intern/util.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c
source/creator/CMakeLists.txt
source/creator/SConscript
source/creator/creator.c
tools/Blender.py
tools/btools.py