[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12420] branches/cloth/blender: svn merge -r 12391:12419 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Daniel Genrich
daniel.genrich at gmx.net
Sun Oct 28 20:12:09 CET 2007
Revision: 12420
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12420
Author: genscher
Date: 2007-10-28 20:12:08 +0100 (Sun, 28 Oct 2007)
Log Message:
-----------
svn merge -r 12391:12419 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/cloth/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/cloth/blender/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
branches/cloth/blender/projectfiles_vc7/blender/nodes/nodes.vcproj
branches/cloth/blender/projectfiles_vc7/blender/src/BL_src.vcproj
branches/cloth/blender/source/blender/blenkernel/BKE_cloth.h
branches/cloth/blender/source/blender/blenkernel/BKE_node.h
branches/cloth/blender/source/blender/blenkernel/intern/blender.c
branches/cloth/blender/source/blender/blenkernel/intern/constraint.c
branches/cloth/blender/source/blender/blenkernel/intern/node.c
branches/cloth/blender/source/blender/blenkernel/intern/object.c
branches/cloth/blender/source/blender/imbuf/intern/radiance_hdr.c
branches/cloth/blender/source/blender/makesdna/DNA_node_types.h
branches/cloth/blender/source/blender/makesdna/DNA_scene_types.h
branches/cloth/blender/source/blender/nodes/CMP_node.h
branches/cloth/blender/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
branches/cloth/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
branches/cloth/blender/source/blender/nodes/intern/CMP_util.c
branches/cloth/blender/source/blender/nodes/intern/CMP_util.h
branches/cloth/blender/source/blender/python/api2_2x/Armature.c
branches/cloth/blender/source/blender/python/api2_2x/Bone.c
branches/cloth/blender/source/blender/python/api2_2x/Bone.h
branches/cloth/blender/source/blender/python/api2_2x/Pose.c
branches/cloth/blender/source/blender/python/api2_2x/Window.c
branches/cloth/blender/source/blender/python/api2_2x/doc/Armature.py
branches/cloth/blender/source/blender/python/api2_2x/doc/Pose.py
branches/cloth/blender/source/blender/python/api2_2x/doc/Render.py
branches/cloth/blender/source/blender/python/api2_2x/doc/Window.py
branches/cloth/blender/source/blender/python/api2_2x/sceneRender.c
branches/cloth/blender/source/blender/src/drawimage.c
branches/cloth/blender/source/blender/src/drawnode.c
branches/cloth/blender/source/blender/src/editseq.c
branches/cloth/blender/source/blender/src/filelist.c
branches/cloth/blender/source/blender/src/transform_conversions.c
Added Paths:
-----------
branches/cloth/blender/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
branches/cloth/blender/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c
branches/cloth/blender/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
Modified: branches/cloth/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
===================================================================
--- branches/cloth/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj 2007-10-28 19:07:51 UTC (rev 12419)
+++ branches/cloth/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj 2007-10-28 19:12:08 UTC (rev 12420)
@@ -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"
@@ -126,7 +126,7 @@
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"
Modified: branches/cloth/blender/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
===================================================================
--- branches/cloth/blender/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj 2007-10-28 19:07:51 UTC (rev 12419)
+++ branches/cloth/blender/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj 2007-10-28 19:12:08 UTC (rev 12420)
@@ -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"
@@ -176,8 +176,8 @@
<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"
@@ -490,6 +490,60 @@
</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"
Modified: branches/cloth/blender/projectfiles_vc7/blender/nodes/nodes.vcproj
===================================================================
--- branches/cloth/blender/projectfiles_vc7/blender/nodes/nodes.vcproj 2007-10-28 19:07:51 UTC (rev 12419)
+++ branches/cloth/blender/projectfiles_vc7/blender/nodes/nodes.vcproj 2007-10-28 19:12:08 UTC (rev 12420)
@@ -264,6 +264,9 @@
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
@@ -276,6 +279,9 @@
RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_invert.c">
</File>
<File
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list