[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16398] branches/sim_physics: svn merge -r 16371:16396 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Benoit Bolsee benoit.bolsee at online.be
Sat Sep 6 19:50:36 CEST 2008 

Revision: 16398
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16398
Author:   ben2610
Date:     2008-09-06 19:49:26 +0200 (Sat, 06 Sep 2008)

Log Message:
-----------
svn merge -r 16371:16396 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/sim_physics/CMake/macros.cmake
    branches/sim_physics/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/sim_physics/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
    branches/sim_physics/projectfiles_vc7/blender/blender.sln
    branches/sim_physics/projectfiles_vc7/blender/blender.vcproj
    branches/sim_physics/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
    branches/sim_physics/projectfiles_vc7/blender/nodes/nodes.vcproj
    branches/sim_physics/projectfiles_vc7/blender/radiosity/BRA_radiosity.vcproj
    branches/sim_physics/projectfiles_vc7/blender/src/BL_src.vcproj
    branches/sim_physics/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
    branches/sim_physics/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
    branches/sim_physics/projectfiles_vc7/gameengine/expression/EXP_expressions.vcproj
    branches/sim_physics/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
    branches/sim_physics/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
    branches/sim_physics/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
    branches/sim_physics/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
    branches/sim_physics/release/scripts/object_find.py
    branches/sim_physics/source/blender/blenkernel/intern/softbody.c
    branches/sim_physics/source/blender/blenkernel/intern/suggestions.c
    branches/sim_physics/source/blender/blenkernel/intern/text.c
    branches/sim_physics/source/blender/blenlib/SConscript
    branches/sim_physics/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/sim_physics/source/blender/blenloader/intern/readfile.c
    branches/sim_physics/source/blender/blenloader/intern/writefile.c
    branches/sim_physics/source/blender/gpu/GPU_material.h
    branches/sim_physics/source/blender/gpu/intern/gpu_codegen.c
    branches/sim_physics/source/blender/gpu/intern/gpu_draw.c
    branches/sim_physics/source/blender/gpu/intern/gpu_material.c
    branches/sim_physics/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/sim_physics/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/sim_physics/source/blender/include/BIF_space.h
    branches/sim_physics/source/blender/makesdna/DNA_actuator_types.h
    branches/sim_physics/source/blender/makesdna/DNA_ipo_types.h
    branches/sim_physics/source/blender/makesdna/DNA_space_types.h
    branches/sim_physics/source/blender/makesdna/DNA_userdef_types.h
    branches/sim_physics/source/blender/python/api2_2x/Mathutils.c
    branches/sim_physics/source/blender/python/api2_2x/Mathutils.h
    branches/sim_physics/source/blender/python/api2_2x/Mesh.c
    branches/sim_physics/source/blender/python/api2_2x/Texture.c
    branches/sim_physics/source/blender/python/api2_2x/doc/Mesh.py
    branches/sim_physics/source/blender/python/api2_2x/gen_utils.h
    branches/sim_physics/source/blender/src/buttons_logic.c
    branches/sim_physics/source/blender/src/drawgpencil.c
    branches/sim_physics/source/blender/src/drawimage.c
    branches/sim_physics/source/blender/src/drawview.c
    branches/sim_physics/source/blender/src/editsound.c
    branches/sim_physics/source/blender/src/gpencil.c
    branches/sim_physics/source/blender/src/header_image.c
    branches/sim_physics/source/blender/src/header_node.c
    branches/sim_physics/source/blender/src/keyval.c
    branches/sim_physics/source/blender/src/space.c
    branches/sim_physics/source/blender/src/usiblender.c
    branches/sim_physics/source/blender/src/verse_image.c
    branches/sim_physics/source/blender/src/view.c
    branches/sim_physics/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/sim_physics/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/sim_physics/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/sim_physics/source/gameengine/Expressions/Makefile
    branches/sim_physics/source/gameengine/Expressions/PyObjectPlus.h
    branches/sim_physics/source/gameengine/GameLogic/Makefile
    branches/sim_physics/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/sim_physics/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/sim_physics/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/sim_physics/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/sim_physics/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_GameObject.h
    branches/sim_physics/source/gameengine/Ketsji/KX_Light.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/sim_physics/source/gameengine/Ketsji/KX_Scene.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    branches/sim_physics/source/gameengine/Ketsji/KX_VisibilityActuator.h
    branches/sim_physics/source/gameengine/PyDoc/KX_SCA_ReplaceMeshActuator.py
    branches/sim_physics/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp

Added Paths:
-----------
    branches/sim_physics/projectfiles_vc7/blender/gpu/
    branches/sim_physics/projectfiles_vc7/blender/gpu/BL_gpu.vcproj

Removed Paths:
-------------
    branches/sim_physics/projectfiles_vc7/blender/gpu/BL_gpu.vcproj

Modified: branches/sim_physics/CMake/macros.cmake
===================================================================
--- branches/sim_physics/CMake/macros.cmake	2008-09-06 17:04:54 UTC (rev 16397)
+++ branches/sim_physics/CMake/macros.cmake	2008-09-06 17:49:26 UTC (rev 16398)
@@ -39,7 +39,9 @@
 
 MACRO(SETUP_LIBDIRS)
   # see "cmake --help-policy CMP0003"
-  CMAKE_POLICY(SET CMP0003 NEW)
+  if(COMMAND cmake_policy)
+    CMAKE_POLICY(SET CMP0003 NEW)
+  endif(COMMAND cmake_policy)
   LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
   IF(WITH_INTERNATIONAL)
     LINK_DIRECTORIES(${GETTEXT_LIBPATH})

Modified: branches/sim_physics/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/sim_physics/intern/ghost/intern/GHOST_WindowWin32.cpp	2008-09-06 17:04:54 UTC (rev 16397)
+++ branches/sim_physics/intern/ghost/intern/GHOST_WindowWin32.cpp	2008-09-06 17:49:26 UTC (rev 16398)
@@ -437,7 +437,13 @@
 	// adding a glFinish() here is to prevent Geforce in 'full scene antialias' mode
 	// from antialising the Blender window. Officially a swapbuffers does a glFinish
 	// itself, so this feels really like a hack... but it won't harm. (ton)
-	glFinish();
+	// 
+	// disabled this because it is a performance killer for the game engine, glFinish
+	// forces synchronization with the graphics card and calling it is strongly
+	// discouraged for good performance. (brecht)
+	//
+	// glFinish();
+
 	return ::SwapBuffers(m_hDC) == TRUE ? GHOST_kSuccess : GHOST_kFailure;
 }
 

Modified: branches/sim_physics/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
===================================================================
--- branches/sim_physics/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj	2008-09-06 17:04:54 UTC (rev 16397)
+++ branches/sim_physics/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj	2008-09-06 17:49:26 UTC (rev 16398)
@@ -21,7 +21,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -75,7 +75,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\lib\windows\ffmpeg\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
@@ -129,7 +129,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="_DEBUG,WIN32,_LIB;WITH_FFMPEG"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -183,7 +183,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\lib\windows\ffmpeg\include"
+				AdditionalIncludeDirectories="..\..\..\..\build\msvc_7\intern\bsp\include;..\..\..\..\build\msvc_7\intern\bmfont\include;..\..\..\..\build\msvc_7\intern\iksolver\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\..\lib\windows\python\include\python2.5;..\..\..\..\lib\windows\ffmpeg\include;..\..\..\source\blender;..\..\..\source\blender\avi;..\..\..\source\blender\img;..\..\..\source\blender\imbuf;..\..\..\source\blender\blenlib;..\..\..\source\blender\python;..\..\..\source\blender\include;..\..\..\source\blender\blenkernel;..\..\..\source\blender\makesdna;..\..\..\source\blender\blenloader;..\..\..\source\blender\renderconverter;..\..\..\source\blender\render\extern\include;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\kernel\gen_system;..\..\..\source\gameengine\SoundSystem;..\..\..\..\build\msvc_7\extern\glew\include;..\..\..\source\blender\gpu"
 				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"

Modified: branches/sim_physics/projectfiles_vc7/blender/blender.sln
===================================================================
--- branches/sim_physics/projectfiles_vc7/blender/blender.sln	2008-09-06 17:04:54 UTC (rev 16397)
+++ branches/sim_physics/projectfiles_vc7/blender/blender.sln	2008-09-06 17:49:26 UTC (rev 16398)
@@ -14,6 +14,7 @@
 		{0A73055E-4DED-40CD-9F72-9093ED3EEC7E} = {0A73055E-4DED-40CD-9F72-9093ED3EEC7E}
 		{09222F5E-1625-4FF3-A89A-384D16875EE5} = {09222F5E-1625-4FF3-A89A-384D16875EE5}

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list