diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-23 22:50:56 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-09-23 22:50:56 +0400 |
| commit | a42ba82f638e481d7fd3c3ed2ba05c331ef6717e (patch) | |
| tree | 81a2b9221799707b49b74a5df8bb3ff964ba78bd /source/blender/imbuf/CMakeLists.txt | |
| parent | 7afbdff1b6c348227e652e1c3071ab7ba7c91c44 (diff) | |
| parent | a73dd3476e7d180d3320afc04d218ce22f2f3bfc (diff) | |
Merged changes in the trunk up to revision 50829.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material). OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.
Diffstat (limited to 'source/blender/imbuf/CMakeLists.txt')
| -rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index aa4454562b4..bbe70a7d73f 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -30,6 +30,7 @@ set(INC ../blenlib ../blenloader ../makesdna + ../makesrna ../../../intern/guardedalloc ../../../intern/memutil ) @@ -45,6 +46,7 @@ set(SRC intern/anim_movie.c intern/bmp.c intern/cache.c + intern/colormanagement.c intern/divers.c intern/filetype.c intern/filter.c @@ -67,16 +69,19 @@ set(SRC intern/util.c intern/writeimage.c + IMB_colormanagement.h IMB_imbuf.h IMB_imbuf_types.h IMB_moviecache.h IMB_thumbs.h intern/IMB_allocimbuf.h intern/IMB_anim.h + intern/IMB_colormanagement_intern.h intern/IMB_filetype.h intern/IMB_filter.h intern/IMB_indexer.h intern/IMB_metadata.h + intern/imbuf.h intern/cineon/cin_debug_stuff.h intern/cineon/cineonfile.h intern/cineon/cineonlib.h @@ -94,7 +99,6 @@ set(SRC intern/dds/PixelFormat.h intern/dds/Stream.h intern/dds/dds_api.h - intern/imbuf.h intern/openexr/openexr_api.h intern/openexr/openexr_multi.h @@ -180,6 +184,10 @@ if(WITH_IMAGE_HDR) add_definitions(-DWITH_HDR) endif() +list(APPEND INC + ../../../intern/opencolorio +) + if(WIN32) list(APPEND INC ../../../intern/utfconv |