code cleanup: correct include paths and comment
authorCampbell Barton <ideasman42@gmail.com>
Mon, 17 Sep 2012 04:08:36 +0000 (04:08 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 17 Sep 2012 04:08:36 +0000 (04:08 +0000)
extern/libmv/third_party/ceres/CMakeLists.txt
extern/libmv/third_party/ceres/bundle.sh
source/blender/editors/space_file/fsmenu.h
source/blender/imbuf/CMakeLists.txt

index 2fd8c74881790030dd83040b4d31a112bd575014..0ce8e273f4a063369d714c4d519abd212a94cd6c 100644 (file)
@@ -220,7 +220,7 @@ if(WIN32)
 
        if(NOT MINGW)
                list(APPEND INC
 
        if(NOT MINGW)
                list(APPEND INC
-                       third_party/msinttypes
+                       ../msinttypes
                )
        endif()
 else()
                )
        endif()
 else()
index a502c3f44530347443f234ada906bb6c18dd1f7b..902fce5f39866a7deaa9cf3d13ec9989a9d19e39 100755 (executable)
@@ -145,7 +145,7 @@ if(WIN32)
 
        if(NOT MINGW)
                list(APPEND INC
 
        if(NOT MINGW)
                list(APPEND INC
-                       third_party/msinttypes
+                       ../msinttypes
                )
        endif()
 else()
                )
        endif()
 else()
index 875f8de42bdedbbc6df5ba775f4bbeeaef7a5b2f..30730578085d1b26ed47a4ce949c7678a184f044 100644 (file)
@@ -46,7 +46,7 @@ typedef enum FSMenuCategory {
 typedef enum FSMenuInsert {
        FS_INSERT_SORTED = (1 << 0),
        FS_INSERT_SAVE   = (1 << 1),
 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;
 } FSMenuInsert;
 
 struct FSMenu;
index 8849265679a0524d6e72fce7cc8ff6222c719b24..bbe70a7d73f6ac863894bdf44e327acbdd443e89 100644 (file)
@@ -76,10 +76,12 @@ set(SRC
        IMB_thumbs.h
        intern/IMB_allocimbuf.h
        intern/IMB_anim.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/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
        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/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
        
        intern/openexr/openexr_api.h
        intern/openexr/openexr_multi.h