Hi,
Thanks for the fix. My Xcode was not cleaning its cache during my tests and
I ended up overseen this PSD.
For CMake I think the actual fix would be only changing
//source/blender/CMakeLists.txt
"""""”"""""""""""""""""
Modified: trunk/blender/source/blender/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/CMakeLists.txt 2013-10-11 22:37:24 UTC
(rev 60691)
+++ trunk/blender/source/blender/CMakeLists.txt 2013-10-11 23:14:01 UTC
(rev 60692)
@@ -117,7 +117,7 @@
add_subdirectory(imbuf/intern/openexr)
endif()
-if(WITH_IMAGE_PSD)
+if(WITH_OPENIMAGEIO)
add_subdirectory(imbuf/intern/oiio)
endif()
"""""”"""""""""""""""""
I won't be in front of a computer before ~18 hours. So if you want to
test/commit the above, it would be much appreciated.
(It require reverting the non scons part of your patch though)
Your patch works and fixed the immediate issue so there is no real rush.
Thanks,
Dalai
On Oct 11, 2013 8:14 PM, "Shinsuke Irie" <irieshins...@yahoo.co.jp> wrote:
> Revision: 60692
>
> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60692
> Author: irie
> Date: 2013-10-11 23:14:01 +0000 (Fri, 11 Oct 2013)
> Log Message:
> -----------
> Fix build scripts related to PSD support. Both CMake and SCons builds
> were broken.
>
> Modified Paths:
> --------------
> trunk/blender/source/blender/CMakeLists.txt
> trunk/blender/source/blender/blenkernel/SConscript
> trunk/blender/source/blender/editors/space_file/CMakeLists.txt
> trunk/blender/source/blender/editors/space_image/CMakeLists.txt
> trunk/blender/source/blender/imbuf/CMakeLists.txt
> trunk/blender/source/blender/imbuf/intern/oiio/CMakeLists.txt
> trunk/blender/source/blender/makesrna/SConscript
> trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
> trunk/blender/source/blender/python/intern/CMakeLists.txt
>
> Modified: trunk/blender/source/blender/CMakeLists.txt
> ===================================================================
> --- trunk/blender/source/blender/CMakeLists.txt 2013-10-11 22:37:24 UTC
> (rev 60691)
> +++ trunk/blender/source/blender/CMakeLists.txt 2013-10-11 23:14:01 UTC
> (rev 60692)
> @@ -117,7 +117,7 @@
> add_subdirectory(imbuf/intern/openexr)
> endif()
>
> -if(WITH_IMAGE_PSD)
> +if(WITH_IMAGE_OPENIMAGEIO)
> add_subdirectory(imbuf/intern/oiio)
> endif()
>
>
> Modified: trunk/blender/source/blender/blenkernel/SConscript
> ===================================================================
> --- trunk/blender/source/blender/blenkernel/SConscript 2013-10-11
> 22:37:24 UTC (rev 60691)
> +++ trunk/blender/source/blender/blenkernel/SConscript 2013-10-11
> 23:14:01 UTC (rev 60692)
> @@ -102,7 +102,7 @@
> defs.append('WITH_SDL')
>
> if env['WITH_BF_OIIO']:
> - defs.append('WITH_OIIO')
> + defs.append('WITH_OPENIMAGEIO')
>
> if env['WITH_BF_OPENEXR']:
> defs.append('WITH_OPENEXR')
>
> Modified: trunk/blender/source/blender/editors/space_file/CMakeLists.txt
> ===================================================================
> --- trunk/blender/source/blender/editors/space_file/CMakeLists.txt
> 2013-10-11 22:37:24 UTC (rev 60691)
> +++ trunk/blender/source/blender/editors/space_file/CMakeLists.txt
> 2013-10-11 23:14:01 UTC (rev 60692)
> @@ -58,7 +58,7 @@
> add_definitions(-DWITH_OPENEXR)
> endif()
>
> -if(WITH_OPENIMAGEIO)
> +if(WITH_IMAGE_OPENIMAGEIO)
> add_definitions(-DWITH_OPENIMAGEIO)
> endif()
>
>
> Modified: trunk/blender/source/blender/editors/space_image/CMakeLists.txt
> ===================================================================
> --- trunk/blender/source/blender/editors/space_image/CMakeLists.txt
> 2013-10-11 22:37:24 UTC (rev 60691)
> +++ trunk/blender/source/blender/editors/space_image/CMakeLists.txt
> 2013-10-11 23:14:01 UTC (rev 60692)
> @@ -50,7 +50,7 @@
> add_definitions(-DWITH_INTERNATIONAL)
> endif()
>
> -if(WITH_OPENIMAGEIO)
> +if(WITH_IMAGE_OPENIMAGEIO)
> add_definitions(-DWITH_OPENIMAGEIO)
> endif()
>
>
> Modified: trunk/blender/source/blender/imbuf/CMakeLists.txt
> ===================================================================
> --- trunk/blender/source/blender/imbuf/CMakeLists.txt 2013-10-11
> 22:37:24 UTC (rev 60691)
> +++ trunk/blender/source/blender/imbuf/CMakeLists.txt 2013-10-11
> 23:14:01 UTC (rev 60692)
> @@ -106,7 +106,7 @@
> endif()
>
>
> -if(WITH_OPENIMAGEIO)
> +if(WITH_IMAGE_OPENIMAGEIO)
> add_definitions(-DWITH_OPENIMAGEIO)
> endif()
>
>
> Modified: trunk/blender/source/blender/imbuf/intern/oiio/CMakeLists.txt
> ===================================================================
> --- trunk/blender/source/blender/imbuf/intern/oiio/CMakeLists.txt
> 2013-10-11 22:37:24 UTC (rev 60691)
> +++ trunk/blender/source/blender/imbuf/intern/oiio/CMakeLists.txt
> 2013-10-11 23:14:01 UTC (rev 60692)
> @@ -44,7 +44,7 @@
> openimageio_api.cpp
> )
>
> -if(WITH_OPENIMAGEIO)
> +if(WITH_IMAGE_OPENIMAGEIO)
> list(APPEND INC_SYS
> ${OPENIMAGEIO_INCLUDE_DIRS}
> )
>
> Modified: trunk/blender/source/blender/makesrna/SConscript
> ===================================================================
> --- trunk/blender/source/blender/makesrna/SConscript 2013-10-11
> 22:37:24 UTC (rev 60691)
> +++ trunk/blender/source/blender/makesrna/SConscript 2013-10-11
> 23:14:01 UTC (rev 60692)
> @@ -67,7 +67,7 @@
> incs += ' #/intern/rigidbody'
>
> if env['WITH_BF_OIIO']:
> - defs.append('WITH_OIIO')
> + defs.append('WITH_OPENIMAGEIO')
>
> if env['WITH_BF_OPENEXR']:
> defs.append('WITH_OPENEXR')
>
> Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
> ===================================================================
> --- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2013-10-11
> 22:37:24 UTC (rev 60691)
> +++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2013-10-11
> 23:14:01 UTC (rev 60692)
> @@ -166,7 +166,7 @@
> add_definitions(-DWITH_OPENEXR)
> endif()
>
> -if(WITH_OPENIMAGEIO)
> +if(WITH_IMAGE_OPENIMAGEIO)
> add_definitions(-DWITH_OPENIMAGEIO)
> endif()
>
>
> Modified: trunk/blender/source/blender/python/intern/CMakeLists.txt
> ===================================================================
> --- trunk/blender/source/blender/python/intern/CMakeLists.txt 2013-10-11
> 22:37:24 UTC (rev 60691)
> +++ trunk/blender/source/blender/python/intern/CMakeLists.txt 2013-10-11
> 23:14:01 UTC (rev 60692)
> @@ -174,8 +174,8 @@
> add_definitions(-DWITH_OPENEXR)
> endif()
>
> -if(WITH_OPENIMAGEIO)
> - add_definitions(-DWITH_OPENIMAGEIO)
> +if(WITH_IMAGE_OPENIMAGEIO)
> + add_definitions(-DWITH_OPENIMAGEIO)
> endif()
>
> if(WITH_IMAGE_OPENJPEG)
>
> _______________________________________________
> Bf-blender-cvs mailing list
> bf-blender-...@blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>
_______________________________________________
Bf-committers mailing list
Bf-committers@blender.org
http://lists.blender.org/mailman/listinfo/bf-committers
