== imagebrowser ==
authorAndrea Weikert <elubie@gmx.net>
Sat, 27 Oct 2007 10:06:03 +0000 (10:06 +0000)
committerAndrea Weikert <elubie@gmx.net>
Sat, 27 Oct 2007 10:06:03 +0000 (10:06 +0000)
* added support for .dds image files
* added support for .int, .inta and .rgba image files

== MSVC 7.1 project files ==
* added WITH_DDS to support .dds files when compiling with the project files by default
* added the dds source files to imbuf project
* also added CMP_glare, CMP_lensdist, CMP_tonemap nodes to nodes.vcproj

projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
projectfiles_vc7/blender/nodes/nodes.vcproj
projectfiles_vc7/blender/src/BL_src.vcproj
source/blender/src/filelist.c

index 1a9d45fc7b5f756c1340c5fc178810acf951fb3b..4e58c6617aac5ed6ea336adaef64edaaa0bf18db 100644 (file)
@@ -74,7 +74,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_7\extern\verse\include"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2;WITH_VERSE;WITH_OPENEXR"
+                               PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2;WITH_VERSE;WITH_OPENEXR;WITH_DDS"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="1"
                                DefaultCharIsUnsigned="TRUE"
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenlib;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenloader;..\..\..\source\kernel\gen_system;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_7\extern\verse\include"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_FREETYPE2;UNWRAPPER;WITH_VERSE;WITH_OPENEXR"
+                               PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_FREETYPE2;UNWRAPPER;WITH_VERSE;WITH_OPENEXR;WITH_DDS"
                                StringPooling="TRUE"
                                RuntimeLibrary="0"
                                EnableFunctionLevelLinking="TRUE"
index a214ed3055b40532b1810d402c2b4ca48d5e2858..b7518c0bc823d2a5dc102c82ae2439824e9b432e 100644 (file)
@@ -21,8 +21,8 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr"
-                               PreprocessorDefinitions="_DEBUG,WIN32,_LIB,WITH_QUICKTIME;WITH_OPENEXR"
+                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
+                               PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;WITH_DDS"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="1"
                                DefaultCharIsUnsigned="TRUE"
                        <Tool
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR"
+                               AdditionalIncludeDirectories="..\..\..\..\lib\windows\jpeg\include;..\..\..\..\lib\windows\zlib\include;..\..\..\..\lib\windows\png\include;..\..\..\..\lib\windows\tiff\include;..\..\..\..\lib\windows\openexr\include;..\..\..\..\lib\windows\openexr\include\Iex;..\..\..\..\lib\windows\openexr\include\Imath;..\..\..\..\lib\windows\openexr\include\IlmImf;..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender\avi;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\imbuf\intern;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\imbuf\intern\openexr;..\..\..\source\blender\imbuf\intern\dds"
+                               PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;WITH_DDS"
                                StringPooling="TRUE"
                                RuntimeLibrary="0"
                                EnableFunctionLevelLinking="TRUE"
                                        </File>
                                </Filter>
                        </Filter>
+                       <Filter
+                               Name="dds"
+                               Filter="">
+                               <Filter
+                                       Name="Source Files"
+                                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+                                       <File
+                                               RelativePath="..\..\..\source\blender\imbuf\intern\dds\BlockDXT.cpp">
+                                       </File>
+                                       <File
+                                               RelativePath="..\..\..\source\blender\imbuf\intern\dds\ColorBlock.cpp">
+                                       </File>
+                                       <File
+                                               RelativePath="..\..\..\source\blender\imbuf\intern\dds\dds_api.cpp">
+                                       </File>
+                                       <File
+                                               RelativePath="..\..\..\source\blender\imbuf\intern\dds\DirectDrawSurface.cpp">
+                                       </File>
+                                       <File
+                                               RelativePath="..\..\..\source\blender\imbuf\intern\dds\Image.cpp">
+                                       </File>
+                                       <File
+                                               RelativePath="..\..\..\source\blender\imbuf\intern\dds\Stream.cpp">
+                                       </File>
+                               </Filter>
+                               <Filter
+                                       Name="Header Files"
+                                       Filter="">
+                                       <File
+                                               RelativePath="..\..\..\source\blender\imbuf\intern\dds\BlockDXT.h">
+                                       </File>
+                                       <File
+                                               RelativePath="..\..\..\source\blender\imbuf\intern\dds\Color.h">
+                                       </File>
+                                       <File
+                                               RelativePath="..\..\..\source\blender\imbuf\intern\dds\ColorBlock.h">
+                                       </File>
+                                       <File
+                                               RelativePath="..\..\..\source\blender\imbuf\intern\dds\Common.h">
+                                       </File>
+                                       <File
+                                               RelativePath="..\..\..\source\blender\imbuf\intern\dds\dds_api.h">
+                                       </File>
+                                       <File
+                                               RelativePath="..\..\..\source\blender\imbuf\intern\dds\DirectDrawSurface.h">
+                                       </File>
+                                       <File
+                                               RelativePath="..\..\..\source\blender\imbuf\intern\dds\Image.h">
+                                       </File>
+                                       <File
+                                               RelativePath="..\..\..\source\blender\imbuf\intern\dds\Stream.h">
+                                       </File>
+                               </Filter>
+                       </Filter>
                </Filter>
                <Filter
                        Name="Header Files"
index 86192ddabc9ac4d7056905e6f3457e86b1a12f19..d5fe5328df3bd156c168bc4b274043362dfad49a 100644 (file)
                                <File
                                        RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_gamma.c">
                                </File>
+                               <File
+                                       RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_glare.c">
+                               </File>
                                <File
                                        RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_hueSatVal.c">
                                </File>
                                <File
                                        RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_invert.c">
                                </File>
+                               <File
+                                       RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_lensdist.c">
+                               </File>
                                <File
                                        RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_lummaMatte.c">
                                </File>
                                <File
                                        RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_texture.c">
                                </File>
+                               <File
+                                       RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_tonemap.c">
+                               </File>
                                <File
                                        RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_translate.c">
                                </File>
index 621788a7249ba502937f675f2ffa25c71ef17dfc..685615e4b6d614c2fd4885bdf159a1cf467a0e6b 100644 (file)
@@ -22,7 +22,7 @@
                                Name="VCCLCompilerTool"
                                InlineFunctionExpansion="1"
                                AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\lib\windows\pthreads\include"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER=1;WITH_QUICKTIME;INTERNATIONAL;WITH_VERSE;WITH_OPENEXR"
+                               PreprocessorDefinitions="NDEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER=1;WITH_QUICKTIME;INTERNATIONAL;WITH_VERSE;WITH_OPENEXR;WITH_DDS"
                                StringPooling="TRUE"
                                RuntimeLibrary="0"
                                EnableFunctionLevelLinking="TRUE"
@@ -74,7 +74,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="0"
                                AdditionalIncludeDirectories="..\..\..\..\lib\windows\QTDevWin\CIncludes;..\..\..\..\lib\windows\sdl\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\ghost\include;..\..\..\..\build\msvc_7\intern\elbeem\include;..\..\..\..\build\msvc_7\intern\opennl\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\blenkey\include;..\..\..\..\build\msvc_7\intern\decimation\include;..\..\..\..\build\msvc_7\intern\memutil\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\build\msvc_7\intern\soundsystem\include;..\..\..\source\blender;..\..\..\source\blender\img;..\..\..\source\blender\verify;..\..\..\source\blender\ftfont;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\renderui;..\..\..\source\blender\blenloader;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\nodes;..\..\..\source\blender\blenpluginapi;..\..\..\source\blender\renderconverter;..\..\..\source\blender\readstreamglue;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\network;..\..\..\source\gameengine\soundsystem\snd_openal;..\..\..\..\build\msvc_7\extern\verse\include;..\..\..\..\lib\windows\pthreads\include"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER;WITH_QUICKTIME;INTERNATIONAL;WITH_VERSE;WITH_OPENEXR"
+                               PreprocessorDefinitions="_DEBUG;WIN32;_LIB;_CONSOLE;GAMEBLENDER;WITH_QUICKTIME;INTERNATIONAL;WITH_VERSE;WITH_OPENEXR;WITH_DDS"
                                BasicRuntimeChecks="3"
                                RuntimeLibrary="1"
                                DefaultCharIsUnsigned="TRUE"
index 54fab06f8114a5a7a99fd693e216ae9e17be50ea..45341c2b798e349cd51d86d34d9cbf5c1a40e254 100644 (file)
@@ -709,10 +709,13 @@ void BIF_filelist_setfiletypes(struct FileList* filelist, short has_quicktime)
                                        || BLI_testextensie(file->relname, ".otc")) {
                                file->flags |= FTFONTFILE;                      
                } else if (has_quicktime){
-                       if(             BLI_testextensie(file->relname, ".jpg")
+                       if(             BLI_testextensie(file->relname, ".int")
+                               ||  BLI_testextensie(file->relname, ".inta")
+                               ||  BLI_testextensie(file->relname, ".jpg")
                                ||      BLI_testextensie(file->relname, ".jpeg")
                                ||      BLI_testextensie(file->relname, ".tga")
                                ||      BLI_testextensie(file->relname, ".rgb")
+                               ||      BLI_testextensie(file->relname, ".rgba")
                                ||      BLI_testextensie(file->relname, ".bmp")
                                ||      BLI_testextensie(file->relname, ".png")
                                ||      BLI_testextensie(file->relname, ".iff")
@@ -726,6 +729,9 @@ void BIF_filelist_setfiletypes(struct FileList* filelist, short has_quicktime)
                                ||      BLI_testextensie(file->relname, ".pntg") //macpaint
                                ||      BLI_testextensie(file->relname, ".qtif")
                                ||      BLI_testextensie(file->relname, ".sgi")
+#ifdef WITH_DDS
+                               ||      BLI_testextensie(file->relname, ".dds")
+#endif
 #ifdef WITH_OPENEXR
                                ||      BLI_testextensie(file->relname, ".exr")
 #endif
@@ -745,14 +751,20 @@ void BIF_filelist_setfiletypes(struct FileList* filelist, short has_quicktime)
                                file->flags |= SOUNDFILE;
                        }
                } else { // no quicktime
-                       if(BLI_testextensie(file->relname, ".jpg")
+                       if(BLI_testextensie(file->relname, ".int")
+                               ||      BLI_testextensie(file->relname, ".inta")
+                               ||      BLI_testextensie(file->relname, ".jpg")
                                ||      BLI_testextensie(file->relname, ".tga")
                                ||      BLI_testextensie(file->relname, ".rgb")
+                               ||      BLI_testextensie(file->relname, ".rgba")
                                ||      BLI_testextensie(file->relname, ".bmp")
                                ||      BLI_testextensie(file->relname, ".png")
                                ||      BLI_testextensie(file->relname, ".iff")
                                ||      BLI_testextensie(file->relname, ".tif")
                                ||      BLI_testextensie(file->relname, ".tiff")
+#ifdef WITH_DDS
+                               ||      BLI_testextensie(file->relname, ".dds")
+#endif
 #ifdef WITH_OPENEXR
                                ||      BLI_testextensie(file->relname, ".exr")
 #endif