[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12717] branches/cloth/blender: svn merge -r 12691:12716 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Daniel Genrich
daniel.genrich at gmx.net
Thu Nov 29 13:40:53 CET 2007
Revision: 12717
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12717
Author: genscher
Date: 2007-11-29 13:40:53 +0100 (Thu, 29 Nov 2007)
Log Message:
-----------
svn merge -r 12691:12716 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/blenlib/BLI_blenlib.vcproj
branches/cloth/blender/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
branches/cloth/blender/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
branches/cloth/blender/release/scripts/flt_export.py
branches/cloth/blender/source/blender/blenkernel/BKE_blender.h
branches/cloth/blender/source/blender/blenkernel/BKE_material.h
branches/cloth/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/cloth/blender/source/blender/blenkernel/intern/armature.c
branches/cloth/blender/source/blender/blenkernel/intern/constraint.c
branches/cloth/blender/source/blender/blenkernel/intern/depsgraph.c
branches/cloth/blender/source/blender/blenkernel/intern/displist.c
branches/cloth/blender/source/blender/blenkernel/intern/image.c
branches/cloth/blender/source/blender/blenkernel/intern/material.c
branches/cloth/blender/source/blender/blenkernel/intern/particle.c
branches/cloth/blender/source/blender/blenkernel/intern/scene.c
branches/cloth/blender/source/blender/blenkernel/intern/texture.c
branches/cloth/blender/source/blender/blenloader/intern/readfile.c
branches/cloth/blender/source/blender/include/BDR_editobject.h
branches/cloth/blender/source/blender/include/BIF_editdeform.h
branches/cloth/blender/source/blender/include/BIF_editparticle.h
branches/cloth/blender/source/blender/include/BSE_editipo.h
branches/cloth/blender/source/blender/include/blendef.h
branches/cloth/blender/source/blender/include/butspace.h
branches/cloth/blender/source/blender/makesdna/DNA_constraint_types.h
branches/cloth/blender/source/blender/makesdna/DNA_image_types.h
branches/cloth/blender/source/blender/makesdna/DNA_scene_types.h
branches/cloth/blender/source/blender/makesdna/DNA_space_types.h
branches/cloth/blender/source/blender/makesdna/DNA_texture_types.h
branches/cloth/blender/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
branches/cloth/blender/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
branches/cloth/blender/source/blender/nodes/intern/CMP_nodes/CMP_tonemap.c
branches/cloth/blender/source/blender/python/api2_2x/Blender.c
branches/cloth/blender/source/blender/python/api2_2x/Constraint.c
branches/cloth/blender/source/blender/python/api2_2x/Object.c
branches/cloth/blender/source/blender/python/api2_2x/doc/Blender.py
branches/cloth/blender/source/blender/render/extern/include/RE_pipeline.h
branches/cloth/blender/source/blender/render/extern/include/RE_raytrace.h
branches/cloth/blender/source/blender/render/extern/include/RE_shader_ext.h
branches/cloth/blender/source/blender/render/intern/include/render_types.h
branches/cloth/blender/source/blender/render/intern/source/convertblender.c
branches/cloth/blender/source/blender/render/intern/source/rayshade.c
branches/cloth/blender/source/blender/render/intern/source/raytrace.c
branches/cloth/blender/source/blender/render/intern/source/rendercore.c
branches/cloth/blender/source/blender/render/intern/source/renderdatabase.c
branches/cloth/blender/source/blender/render/intern/source/shadeinput.c
branches/cloth/blender/source/blender/render/intern/source/texture.c
branches/cloth/blender/source/blender/src/SConscript
branches/cloth/blender/source/blender/src/buttons_editing.c
branches/cloth/blender/source/blender/src/buttons_object.c
branches/cloth/blender/source/blender/src/buttons_scene.c
branches/cloth/blender/source/blender/src/buttons_shading.c
branches/cloth/blender/source/blender/src/drawipo.c
branches/cloth/blender/source/blender/src/drawmesh.c
branches/cloth/blender/source/blender/src/drawnode.c
branches/cloth/blender/source/blender/src/drawobject.c
branches/cloth/blender/source/blender/src/drawseq.c
branches/cloth/blender/source/blender/src/drawview.c
branches/cloth/blender/source/blender/src/editarmature.c
branches/cloth/blender/source/blender/src/editdeform.c
branches/cloth/blender/source/blender/src/editipo.c
branches/cloth/blender/source/blender/src/editkey.c
branches/cloth/blender/source/blender/src/editobject.c
branches/cloth/blender/source/blender/src/editparticle.c
branches/cloth/blender/source/blender/src/header_ipo.c
branches/cloth/blender/source/blender/src/meshlaplacian.c
branches/cloth/blender/source/blender/src/meshtools.c
branches/cloth/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/cloth/blender/tools/btools.py
Modified: branches/cloth/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
===================================================================
--- branches/cloth/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj 2007-11-29 12:29:32 UTC (rev 12716)
+++ branches/cloth/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj 2007-11-29 12:40:53 UTC (rev 12717)
@@ -229,7 +229,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\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"
+ AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\include;..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\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"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -281,7 +281,7 @@
<Tool
Name="VCCLCompilerTool"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories="..\..\..\..\lib\windows\zlib\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"
+ 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"
StringPooling="TRUE"
RuntimeLibrary="0"
@@ -631,6 +631,9 @@
RelativePath="..\..\..\source\blender\blenkernel\BKE_packedFile.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenkernel\BKE_particle.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenkernel\BKE_plugin_types.h">
</File>
<File
Modified: branches/cloth/blender/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
===================================================================
--- branches/cloth/blender/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj 2007-11-29 12:29:32 UTC (rev 12716)
+++ branches/cloth/blender/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj 2007-11-29 12:40:53 UTC (rev 12717)
@@ -347,6 +347,9 @@
RelativePath="..\..\..\source\blender\blenlib\intern\BLI_heap.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenlib\intern\BLI_kdtree.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\intern\BLI_linklist.c">
</File>
<File
@@ -450,6 +453,9 @@
RelativePath="..\..\..\source\blender\blenlib\BLI_jitter.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenlib\BLI_kdtree.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\BLI_linklist.h">
</File>
<File
Modified: branches/cloth/blender/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj
===================================================================
--- branches/cloth/blender/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj 2007-11-29 12:29:32 UTC (rev 12716)
+++ branches/cloth/blender/projectfiles_vc7/blender/imbuf/BL_imbuf.vcproj 2007-11-29 12:40:53 UTC (rev 12717)
@@ -228,8 +228,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"
+ 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_DDS"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
DefaultCharIsUnsigned="TRUE"
@@ -280,8 +280,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"
+ 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_DDS"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list