Blender Git Loki
Git Commits -> Revision 360fcd7
Revision 360fcd7 by Brecht Van Lommel (master) August 16, 2011, 16:15 (GMT) |
Cycles: * add some (disabled) test code for using OpenImageIO in imbuf * link cycles, openimageio and boost into blender instead of a shared library * some cmakefile changes to simplify the code and follow conventions better * this may solve running cycles problems on windows XP, or give a different and hopefully more useful error message |
Commit Details:
Full Hash: 360fcd73fe2868ba32c65697e21ed1bbab8b649a
SVN Revision: 39457
Parent Commit: 18387f3
Lines Changed: +814, -510
2 Added Paths:
/intern/cycles/doc/license/CMakeLists.txt (+13, -0) (View)
/source/blender/imbuf/intern/openimageio.cpp (+237, -0) (View)
/source/blender/imbuf/intern/openimageio.cpp (+237, -0) (View)
1 Deleted Path:
/intern/cycles/cmake/platforms.cmake (+0, -27)
28 Modified Paths:
/build_files/cmake/macros.cmake (+47, -0) (Diff)
/CMakeLists.txt (+96, -7) (Diff)
/intern/cycles/app/CMakeLists.txt (+38, -38) (Diff)
/intern/cycles/blender/addon/engine.py (+8, -8) (Diff)
/intern/cycles/blender/blender_python.cpp (+3, -1) (Diff)
/intern/cycles/blender/CMakeLists.txt (+19, -68) (Diff)
/intern/cycles/bvh/CMakeLists.txt (+4, -4) (Diff)
/intern/cycles/cmake/external_libs.cmake (+80, -174) (Diff)
/intern/cycles/CMakeLists.txt (+67, -68) (Diff)
/intern/cycles/device/CMakeLists.txt (+4, -4) (Diff)
/intern/cycles/doc/CMakeLists.txt (+1, -1) (Diff)
/intern/cycles/kernel/CMakeLists.txt (+39, -38) (Diff)
/intern/cycles/kernel/osl/CMakeLists.txt (+6, -6) (Diff)
/intern/cycles/kernel/osl/nodes/CMakeLists.txt (+12, -12) (Diff)
/intern/cycles/render/CMakeLists.txt (+5, -5) (Diff)
/intern/cycles/subd/CMakeLists.txt (+4, -4) (Diff)
/intern/cycles/util/CMakeLists.txt (+7, -7) (Diff)
/source/blender/editors/screen/area.c (+3, -0) (Diff)
/source/blender/imbuf/CMakeLists.txt (+8, -0) (Diff)
/source/blender/imbuf/IMB_imbuf_types.h (+0, -12) (Diff)
/source/blender/imbuf/intern/filetype.c (+18, -18) (Diff)
/source/blender/imbuf/intern/IMB_filetype.h (+18, -0) (Diff)
/source/blender/imbuf/intern/readimage.c (+31, -6) (Diff)
/source/blender/imbuf/intern/util.c (+5, -1) (Diff)
/source/blender/imbuf/intern/writeimage.c (+1, -1) (Diff)
/source/blender/python/intern/bpy_interface.c (+5, -0) (Diff)
/source/blender/python/intern/CMakeLists.txt (+4, -0) (Diff)
/source/creator/CMakeLists.txt (+31, -0) (Diff)
/CMakeLists.txt (+96, -7) (Diff)
/intern/cycles/app/CMakeLists.txt (+38, -38) (Diff)
/intern/cycles/blender/addon/engine.py (+8, -8) (Diff)
/intern/cycles/blender/blender_python.cpp (+3, -1) (Diff)
/intern/cycles/blender/CMakeLists.txt (+19, -68) (Diff)
/intern/cycles/bvh/CMakeLists.txt (+4, -4) (Diff)
/intern/cycles/cmake/external_libs.cmake (+80, -174) (Diff)
/intern/cycles/CMakeLists.txt (+67, -68) (Diff)
/intern/cycles/device/CMakeLists.txt (+4, -4) (Diff)
/intern/cycles/doc/CMakeLists.txt (+1, -1) (Diff)
/intern/cycles/kernel/CMakeLists.txt (+39, -38) (Diff)
/intern/cycles/kernel/osl/CMakeLists.txt (+6, -6) (Diff)
/intern/cycles/kernel/osl/nodes/CMakeLists.txt (+12, -12) (Diff)
/intern/cycles/render/CMakeLists.txt (+5, -5) (Diff)
/intern/cycles/subd/CMakeLists.txt (+4, -4) (Diff)
/intern/cycles/util/CMakeLists.txt (+7, -7) (Diff)
/source/blender/editors/screen/area.c (+3, -0) (Diff)
/source/blender/imbuf/CMakeLists.txt (+8, -0) (Diff)
/source/blender/imbuf/IMB_imbuf_types.h (+0, -12) (Diff)
/source/blender/imbuf/intern/filetype.c (+18, -18) (Diff)
/source/blender/imbuf/intern/IMB_filetype.h (+18, -0) (Diff)
/source/blender/imbuf/intern/readimage.c (+31, -6) (Diff)
/source/blender/imbuf/intern/util.c (+5, -1) (Diff)
/source/blender/imbuf/intern/writeimage.c (+1, -1) (Diff)
/source/blender/python/intern/bpy_interface.c (+5, -0) (Diff)
/source/blender/python/intern/CMakeLists.txt (+4, -0) (Diff)
/source/creator/CMakeLists.txt (+31, -0) (Diff)