diff options
| -rw-r--r-- | extern/libmv/third_party/ceres/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | extern/libmv/third_party/ceres/bundle.sh | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_file/fsmenu.h | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/extern/libmv/third_party/ceres/CMakeLists.txt b/extern/libmv/third_party/ceres/CMakeLists.txt index 2fd8c748817..0ce8e273f4a 100644 --- a/extern/libmv/third_party/ceres/CMakeLists.txt +++ b/extern/libmv/third_party/ceres/CMakeLists.txt @@ -220,7 +220,7 @@ if(WIN32) if(NOT MINGW) list(APPEND INC - third_party/msinttypes + ../msinttypes ) endif() else() diff --git a/extern/libmv/third_party/ceres/bundle.sh b/extern/libmv/third_party/ceres/bundle.sh index a502c3f4453..902fce5f398 100755 --- a/extern/libmv/third_party/ceres/bundle.sh +++ b/extern/libmv/third_party/ceres/bundle.sh @@ -145,7 +145,7 @@ if(WIN32) if(NOT MINGW) list(APPEND INC - third_party/msinttypes + ../msinttypes ) endif() else() diff --git a/source/blender/editors/space_file/fsmenu.h b/source/blender/editors/space_file/fsmenu.h index 875f8de42bd..30730578085 100644 --- a/source/blender/editors/space_file/fsmenu.h +++ b/source/blender/editors/space_file/fsmenu.h @@ -46,7 +46,7 @@ typedef enum FSMenuCategory { typedef enum FSMenuInsert { FS_INSERT_SORTED = (1 << 0), FS_INSERT_SAVE = (1 << 1), - FS_INSERT_FIRST = (1 << 2) /* moves the item to the front of the list when its already there */ + FS_INSERT_FIRST = (1 << 2) /* moves the item to the front of the list when its not already there */ } FSMenuInsert; struct FSMenu; diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 8849265679a..bbe70a7d73f 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -76,10 +76,12 @@ set(SRC 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 @@ -97,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 |