[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13241] branches/cloth/blender: svn merge -r 13177:13240 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Daniel Genrich daniel.genrich at gmx.net
Tue Jan 15 14:00:30 CET 2008


Revision: 13241
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13241
Author:   genscher
Date:     2008-01-15 14:00:29 +0100 (Tue, 15 Jan 2008)

Log Message:
-----------
svn merge -r 13177:13240 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/nodes/nodes.vcproj
    branches/cloth/blender/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
    branches/cloth/blender/release/scripts/export_mdd.py
    branches/cloth/blender/release/scripts/flt_export.py
    branches/cloth/blender/release/scripts/flt_import.py
    branches/cloth/blender/release/scripts/import_mdd.py
    branches/cloth/blender/source/blender/blenkernel/BKE_anim.h
    branches/cloth/blender/source/blender/blenkernel/BKE_global.h
    branches/cloth/blender/source/blender/blenkernel/BKE_particle.h
    branches/cloth/blender/source/blender/blenkernel/CMakeLists.txt
    branches/cloth/blender/source/blender/blenkernel/intern/DerivedMesh.c
    branches/cloth/blender/source/blender/blenkernel/intern/Makefile
    branches/cloth/blender/source/blender/blenkernel/intern/action.c
    branches/cloth/blender/source/blender/blenkernel/intern/anim.c
    branches/cloth/blender/source/blender/blenkernel/intern/curve.c
    branches/cloth/blender/source/blender/blenkernel/intern/multires.c
    branches/cloth/blender/source/blender/blenkernel/intern/particle.c
    branches/cloth/blender/source/blender/blenkernel/intern/particle_system.c
    branches/cloth/blender/source/blender/blenkernel/intern/scene.c
    branches/cloth/blender/source/blender/blenkernel/intern/softbody.c
    branches/cloth/blender/source/blender/blenlib/intern/arithb.c
    branches/cloth/blender/source/blender/blenloader/intern/readfile.c
    branches/cloth/blender/source/blender/blenloader/intern/writefile.c
    branches/cloth/blender/source/blender/include/BIF_editaction.h
    branches/cloth/blender/source/blender/include/BIF_space.h
    branches/cloth/blender/source/blender/include/BIF_transform.h
    branches/cloth/blender/source/blender/include/BSE_node.h
    branches/cloth/blender/source/blender/include/blendef.h
    branches/cloth/blender/source/blender/include/butspace.h
    branches/cloth/blender/source/blender/include/transform.h
    branches/cloth/blender/source/blender/makesdna/DNA_color_types.h
    branches/cloth/blender/source/blender/makesdna/DNA_material_types.h
    branches/cloth/blender/source/blender/makesdna/DNA_object_force.h
    branches/cloth/blender/source/blender/makesdna/DNA_scene_types.h
    branches/cloth/blender/source/blender/makesdna/DNA_texture_types.h
    branches/cloth/blender/source/blender/makesdna/DNA_userdef_types.h
    branches/cloth/blender/source/blender/makesdna/DNA_view3d_types.h
    branches/cloth/blender/source/blender/python/api2_2x/doc/Mathutils.py
    branches/cloth/blender/source/blender/radiosity/intern/source/radfactors.c
    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/include/renderdatabase.h
    branches/cloth/blender/source/blender/render/intern/include/strand.h
    branches/cloth/blender/source/blender/render/intern/source/convertblender.c
    branches/cloth/blender/source/blender/render/intern/source/imagetexture.c
    branches/cloth/blender/source/blender/render/intern/source/pixelshading.c
    branches/cloth/blender/source/blender/render/intern/source/rayshade.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/strand.c
    branches/cloth/blender/source/blender/render/intern/source/texture.c
    branches/cloth/blender/source/blender/render/intern/source/zbuf.c
    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_shading.c
    branches/cloth/blender/source/blender/src/drawnode.c
    branches/cloth/blender/source/blender/src/drawview.c
    branches/cloth/blender/source/blender/src/edit.c
    branches/cloth/blender/source/blender/src/editaction.c
    branches/cloth/blender/source/blender/src/editipo.c
    branches/cloth/blender/source/blender/src/editnla.c
    branches/cloth/blender/source/blender/src/editsima.c
    branches/cloth/blender/source/blender/src/editview.c
    branches/cloth/blender/source/blender/src/header_action.c
    branches/cloth/blender/source/blender/src/header_imasel.c
    branches/cloth/blender/source/blender/src/header_info.c
    branches/cloth/blender/source/blender/src/header_time.c
    branches/cloth/blender/source/blender/src/header_view3d.c
    branches/cloth/blender/source/blender/src/interface_draw.c
    branches/cloth/blender/source/blender/src/poselib.c
    branches/cloth/blender/source/blender/src/poseobject.c
    branches/cloth/blender/source/blender/src/sculptmode.c
    branches/cloth/blender/source/blender/src/space.c
    branches/cloth/blender/source/blender/src/transform.c
    branches/cloth/blender/source/blender/src/transform_constraints.c
    branches/cloth/blender/source/blender/src/transform_conversions.c
    branches/cloth/blender/source/blender/src/transform_manipulator.c
    branches/cloth/blender/source/blender/src/transform_snap.c
    branches/cloth/blender/source/blender/src/usiblender.c
    branches/cloth/blender/source/blender/src/view.c

Modified: branches/cloth/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
===================================================================
--- branches/cloth/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj	2008-01-15 04:49:09 UTC (rev 13240)
+++ branches/cloth/blender/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj	2008-01-15 13:00:29 UTC (rev 13241)
@@ -73,7 +73,7 @@
 			<Tool
 				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"
+				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;..\..\..\..\build\msvc_7\intern\opennl\include"
 				PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_FREETYPE2;WITH_VERSE;WITH_OPENEXR;WITH_DDS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -125,7 +125,7 @@
 			<Tool
 				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"
+				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;..\..\..\..\build\msvc_7\intern\opennl\include"
 				PreprocessorDefinitions="NDEBUG;WIN32;_LIB;WITH_FREETYPE2;UNWRAPPER;WITH_VERSE;WITH_OPENEXR;WITH_DDS"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -229,7 +229,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				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"
+				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;..\..\..\..\build\msvc_7\intern\opennl\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\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"
+				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;..\..\..\..\build\msvc_7\intern\opennl\include"
 				PreprocessorDefinitions="NDEBUG,WIN32,_LIB,WITH_FREETYPE2,UNWRAPPER"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"

Modified: branches/cloth/blender/projectfiles_vc7/blender/nodes/nodes.vcproj
===================================================================
--- branches/cloth/blender/projectfiles_vc7/blender/nodes/nodes.vcproj	2008-01-15 04:49:09 UTC (rev 13240)
+++ branches/cloth/blender/projectfiles_vc7/blender/nodes/nodes.vcproj	2008-01-15 13:00:29 UTC (rev 13241)
@@ -222,6 +222,9 @@
 					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_alphaOver.c">
 				</File>
 				<File
+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_bilateralblur.c">
+				</File>
+				<File
 					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_blur.c">
 				</File>
 				<File
@@ -255,6 +258,9 @@
 					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_dilate.c">
 				</File>
 				<File
+					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_directionalblur.c">
+				</File>
+				<File
 					RelativePath="..\..\..\source\blender\nodes\intern\CMP_nodes\CMP_displace.c">
 				</File>
 				<File

Modified: branches/cloth/blender/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj
===================================================================
--- branches/cloth/blender/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj	2008-01-15 04:49:09 UTC (rev 13240)
+++ branches/cloth/blender/projectfiles_vc7/gameengine/gameplayer/ghost/GP_ghost.vcproj	2008-01-15 13:00:29 UTC (rev 13241)
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list