diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2013-10-09 01:17:24 +0400 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2013-10-09 01:17:24 +0400 |
commit | 4abb8fde95260e692b3cd5b5b2f8bcd1d1f3be3b (patch) | |
tree | 9c3d68aa7abd18ddfef5b3af643b8a7556903e18 /source/blender/imbuf/intern/oiio/CMakeLists.txt | |
parent | 590f58d45583f36522ffbcebd68b4a6c921bebeb (diff) |
Photoshop PSD support
We now support the combined layer of Photoshop files (stored as layer 0
in the file). This way users can keep their files as multilayer PSD and
Blender always handle them as flat images.
For perfect alpha this requires an OpenImageIO update:
https://github.com/OpenImageIO/oiio/commit/342cc2633ff590a3bb278481c61ae798c7148361
Photoshop sample files:
https://github.com/OpenImageIO/oiio-images
Brecht has some pending fixes to push for OIIO as well, so we may as
well wait to update our libraries.
What works:
===========
* 8bit images (with or without alpha)
* 16bits images (alpha discarded)
* Photoshop files saved with 'Maximum Compatibility'
* Cycles, Blender internal, BGE (and player)
Known limitations
(due to OIIO dependency):
=========================
* Images with less than 4 channels show a wrong thumbnail (bug may be in OIIO)
* Packed images are not supported
* We do not write PSD files.
Note: old Blenders have support for PSD via Quicktime library. But due
to license issues this was discontinued.
Many thanks for Brecht van Lommel for reviewing the patch, suggesting
multiple improvements and to help solving the alpha issue.
Diffstat (limited to 'source/blender/imbuf/intern/oiio/CMakeLists.txt')
-rw-r--r-- | source/blender/imbuf/intern/oiio/CMakeLists.txt | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/oiio/CMakeLists.txt b/source/blender/imbuf/intern/oiio/CMakeLists.txt new file mode 100644 index 00000000000..f5ee5eb6589 --- /dev/null +++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt @@ -0,0 +1,54 @@ +# ***** BEGIN GPL LICENSE BLOCK ***** +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# The Original Code is Copyright (C) 2013, Blender Foundation +# All rights reserved. +# +# The Original Code is: all of this file. +# +# Contributor(s): +# +# ***** END GPL LICENSE BLOCK ***** + +set(INC + . + .. + ../.. + ../../../blenkernel + ../../../blenlib + ../../../makesdna + ../../../../../intern/guardedalloc + ../../../../../intern/utfconv +) + +set(INC_SYS + +) + +set(SRC + openimageio_api.h + + openimageio_api.cpp +) + +if(WITH_IMAGE_PSD) + list(APPEND INC_SYS + ${OPENIMAGEIO_INCLUDE_DIRS} + ) + add_definitions(-DWITH_PSD) +endif() + +blender_add_lib(bf_imbuf_openimageio "${SRC}" "${INC}" "${INC_SYS}") |