[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16035] branches/soc-2008-quorn: Merge from trunk: 15912:16031

Ian Thompson quornian at googlemail.com
Sat Aug 9 12:13:00 CEST 2008


Revision: 16035
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16035
Author:   quorn
Date:     2008-08-09 12:12:59 +0200 (Sat, 09 Aug 2008)

Log Message:
-----------
Merge from trunk: 15912:16031

Modified Paths:
--------------
    branches/soc-2008-quorn/CMakeLists.txt
    branches/soc-2008-quorn/SConstruct
    branches/soc-2008-quorn/config/linux2-config.py
    branches/soc-2008-quorn/intern/boolop/SConscript
    branches/soc-2008-quorn/intern/boolop/intern/BOP_Interface.cpp
    branches/soc-2008-quorn/intern/boolop/make/msvc_7_0/boolop.vcproj
    branches/soc-2008-quorn/intern/bsp/SConscript
    branches/soc-2008-quorn/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
    branches/soc-2008-quorn/projectfiles_vc7/blender/blender.sln
    branches/soc-2008-quorn/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
    branches/soc-2008-quorn/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
    branches/soc-2008-quorn/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
    branches/soc-2008-quorn/release/scripts/bpymodules/colladaImEx/collada.py
    branches/soc-2008-quorn/release/scripts/bpymodules/colladaImEx/cstartup.py
    branches/soc-2008-quorn/release/scripts/bpymodules/colladaImEx/helperObjects.py
    branches/soc-2008-quorn/release/scripts/bpymodules/colladaImEx/translator.py
    branches/soc-2008-quorn/release/scripts/bpymodules/colladaImEx/xmlUtils.py
    branches/soc-2008-quorn/release/scripts/flt_export.py
    branches/soc-2008-quorn/release/scripts/flt_palettemanager.py
    branches/soc-2008-quorn/release/scripts/import_dxf.py
    branches/soc-2008-quorn/release/scripts/weightpaint_clean.py
    branches/soc-2008-quorn/source/blender/blenkernel/BKE_texture.h
    branches/soc-2008-quorn/source/blender/blenkernel/bad_level_call_stubs/stubs.c
    branches/soc-2008-quorn/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-quorn/source/blender/blenkernel/intern/collision.c
    branches/soc-2008-quorn/source/blender/blenkernel/intern/customdata.c
    branches/soc-2008-quorn/source/blender/blenkernel/intern/modifier.c
    branches/soc-2008-quorn/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-quorn/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-quorn/source/blender/blenkernel/intern/texture.c
    branches/soc-2008-quorn/source/blender/blenlib/BLI_kdopbvh.h
    branches/soc-2008-quorn/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2008-quorn/source/blender/blenlib/intern/boxpack2d.c
    branches/soc-2008-quorn/source/blender/imbuf/intern/anim.c
    branches/soc-2008-quorn/source/blender/include/BIF_editarmature.h
    branches/soc-2008-quorn/source/blender/include/BIF_editmesh.h
    branches/soc-2008-quorn/source/blender/include/BIF_poseobject.h
    branches/soc-2008-quorn/source/blender/include/butspace.h
    branches/soc-2008-quorn/source/blender/python/BPY_interface.c
    branches/soc-2008-quorn/source/blender/python/api2_2x/Blender.c
    branches/soc-2008-quorn/source/blender/python/api2_2x/Constraint.c
    branches/soc-2008-quorn/source/blender/python/api2_2x/Material.c
    branches/soc-2008-quorn/source/blender/python/api2_2x/Mathutils.c
    branches/soc-2008-quorn/source/blender/python/api2_2x/Mathutils.h
    branches/soc-2008-quorn/source/blender/python/api2_2x/doc/Render.py
    branches/soc-2008-quorn/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-quorn/source/blender/src/buttons_editing.c
    branches/soc-2008-quorn/source/blender/src/buttons_object.c
    branches/soc-2008-quorn/source/blender/src/buttons_scene.c
    branches/soc-2008-quorn/source/blender/src/drawgpencil.c
    branches/soc-2008-quorn/source/blender/src/drawseq.c
    branches/soc-2008-quorn/source/blender/src/editarmature.c
    branches/soc-2008-quorn/source/blender/src/editimasel.c
    branches/soc-2008-quorn/source/blender/src/editmesh_mods.c
    branches/soc-2008-quorn/source/blender/src/editseq.c
    branches/soc-2008-quorn/source/blender/src/header_info.c
    branches/soc-2008-quorn/source/blender/src/header_view3d.c
    branches/soc-2008-quorn/source/blender/src/poselib.c
    branches/soc-2008-quorn/source/blender/src/poseobject.c
    branches/soc-2008-quorn/source/blender/src/space.c
    branches/soc-2008-quorn/source/blender/src/toolbox.c
    branches/soc-2008-quorn/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-quorn/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-quorn/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/soc-2008-quorn/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
    branches/soc-2008-quorn/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h
    branches/soc-2008-quorn/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2008-quorn/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
    branches/soc-2008-quorn/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2008-quorn/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-quorn/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-quorn/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-quorn/source/gameengine/Ketsji/KX_PythonInit.h
    branches/soc-2008-quorn/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/soc-2008-quorn/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    branches/soc-2008-quorn/source/gameengine/Ketsji/SConscript
    branches/soc-2008-quorn/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2008-quorn/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2008-quorn/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2008-quorn/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2008-quorn/source/gameengine/PyDoc/KX_GameObject.py

Added Paths:
-----------
    branches/soc-2008-quorn/source/blender/blenkernel/BKE_bvhutils.h
    branches/soc-2008-quorn/source/blender/blenkernel/intern/bvhutils.c

Modified: branches/soc-2008-quorn/CMakeLists.txt
===================================================================
--- branches/soc-2008-quorn/CMakeLists.txt	2008-08-09 01:43:47 UTC (rev 16034)
+++ branches/soc-2008-quorn/CMakeLists.txt	2008-08-09 10:12:59 UTC (rev 16035)
@@ -183,9 +183,9 @@
   SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++")
 
   IF(WITH_OPENMP)
-    SET(LLIBS "${LLIBS} -lgomp ")
-    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+    SET(LLIBS "${LLIBS} -lgomp")
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
   ENDIF(WITH_OPENMP)
 
 

Modified: branches/soc-2008-quorn/SConstruct
===================================================================
--- branches/soc-2008-quorn/SConstruct	2008-08-09 01:43:47 UTC (rev 16034)
+++ branches/soc-2008-quorn/SConstruct	2008-08-09 10:12:59 UTC (rev 16035)
@@ -184,15 +184,16 @@
                 env['CPPFLAGS'].append('/openmp')
                 env['CXXFLAGS'].append('/openmp')
         else:
-            if env['CC'] == 'icc':
+            if env['CC'][-3:] == 'icc': # to be able to handle CC=/opt/bla/icc case
                 env.Append(LINKFLAGS=['-openmp', '-static-intel'])
                 env['CCFLAGS'].append('-openmp')
                 env['CPPFLAGS'].append('-openmp')
                 env['CXXFLAGS'].append('-openmp')
             else:
-                env['CCFLAGS'].append('-fopenmp')
-                env['CPPFLAGS'].append('-fopenmp')
-                env['CXXFLAGS'].append('-fopenmp')
+                env.Append(CCFLAGS=['-fopenmp']) 
+                env.Append(CPPFLAGS=['-fopenmp'])
+                env.Append(CXXFLAGS=['-fopenmp'])
+                # env.Append(LINKFLAGS=['-fprofile-generate'])
 
 #check for additional debug libnames
 

Modified: branches/soc-2008-quorn/config/linux2-config.py
===================================================================
--- branches/soc-2008-quorn/config/linux2-config.py	2008-08-09 01:43:47 UTC (rev 16034)
+++ branches/soc-2008-quorn/config/linux2-config.py	2008-08-09 10:12:59 UTC (rev 16035)
@@ -139,7 +139,7 @@
 BF_OPENJPEG_INC = '${BF_OPENJPEG}/include'
 BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
 
-WITH_BF_REDCODE = 'true'  
+WITH_BF_REDCODE = 'false'  
 BF_REDCODE = '#extern/libredcode'
 BF_REDCODE_LIB = ''
 # Uncomment the following two lines to use system's ffmpeg

Modified: branches/soc-2008-quorn/intern/boolop/SConscript
===================================================================
--- branches/soc-2008-quorn/intern/boolop/SConscript	2008-08-09 01:43:47 UTC (rev 16034)
+++ branches/soc-2008-quorn/intern/boolop/SConscript	2008-08-09 10:12:59 UTC (rev 16035)
@@ -8,7 +8,7 @@
 incs += ' ../../source/blender/blenlib'
 
 if (env['OURPLATFORM'] == 'win32-mingw'):
-    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [5,50] )
+    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype=['common','intern'], priority = [30,85] )
 else:
     env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='common', priority = 5 )
 

Modified: branches/soc-2008-quorn/intern/boolop/intern/BOP_Interface.cpp
===================================================================
--- branches/soc-2008-quorn/intern/boolop/intern/BOP_Interface.cpp	2008-08-09 01:43:47 UTC (rev 16034)
+++ branches/soc-2008-quorn/intern/boolop/intern/BOP_Interface.cpp	2008-08-09 10:12:59 UTC (rev 16035)
@@ -37,7 +37,7 @@
 #include "BOP_Chrono.h"
 
 #if defined(BOP_ORIG_MERGE) && defined(BOP_NEW_MERGE) 
-#include "../../source/blender/blenkernel/BKE_global.h"
+#include "../../../source/blender/blenkernel/BKE_global.h"
 #endif
 
 BoolOpState BOP_intersectionBoolOp(BOP_Mesh*  meshC,

Modified: branches/soc-2008-quorn/intern/boolop/make/msvc_7_0/boolop.vcproj
===================================================================
--- branches/soc-2008-quorn/intern/boolop/make/msvc_7_0/boolop.vcproj	2008-08-09 01:43:47 UTC (rev 16034)
+++ branches/soc-2008-quorn/intern/boolop/make/msvc_7_0/boolop.vcproj	2008-08-09 10:12:59 UTC (rev 16035)
@@ -279,6 +279,9 @@
 					RelativePath="..\..\intern\BOP_Merge.cpp">
 				</File>
 				<File
+					RelativePath="..\..\intern\BOP_Merge2.cpp">
+				</File>
+				<File
 					RelativePath="..\..\intern\BOP_Mesh.cpp">
 				</File>
 				<File
@@ -331,9 +334,15 @@
 					RelativePath="..\..\intern\BOP_Merge.h">
 				</File>
 				<File
+					RelativePath="..\..\intern\BOP_Merge2.h">
+				</File>
+				<File
 					RelativePath="..\..\intern\BOP_Mesh.h">
 				</File>
 				<File
+					RelativePath="..\..\intern\BOP_Misc.h">
+				</File>
+				<File
 					RelativePath="..\..\intern\BOP_Segment.h">
 				</File>
 				<File

Modified: branches/soc-2008-quorn/intern/bsp/SConscript
===================================================================
--- branches/soc-2008-quorn/intern/bsp/SConscript	2008-08-09 01:43:47 UTC (rev 16034)
+++ branches/soc-2008-quorn/intern/bsp/SConscript	2008-08-09 10:12:59 UTC (rev 16035)
@@ -6,7 +6,7 @@
 incs = 'intern ../container ../moto/include ../memutil'
 
 if (env['OURPLATFORM'] == 'win32-mingw'):
-    env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,26] )
+    env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype=['common','intern'], priority=[26,69] )
 else:
     env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=26 )
 

Modified: branches/soc-2008-quorn/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
===================================================================
--- branches/soc-2008-quorn/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj	2008-08-09 01:43:47 UTC (rev 16034)
+++ branches/soc-2008-quorn/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj	2008-08-09 10:12:59 UTC (rev 16035)
@@ -118,6 +118,114 @@
 			<Tool
 				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
 		</Configuration>
+		<Configuration
+			Name="BlenderPlayer Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<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"
+				PreprocessorDefinitions="_DEBUG,WIN32,_LIB;WITH_FFMPEG"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				DisableLanguageExtensions="FALSE"
+				DefaultCharIsUnsigned="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\python\debug\BPY_python.pch"
+				AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\python\debug\"
+				ObjectFile="..\..\..\..\build\msvc_7\source\blender\python\debug\"
+				ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\python\debug\"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="FALSE"
+				DebugInformationFormat="3"
+				CompileAs="0"
+				DisableSpecificWarnings="4100"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="..\..\..\..\build\msvc_7\libs\debug\BPY_python.lib"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCMIDLTool"/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="BlenderPlayer Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="4"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<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"
+				PreprocessorDefinitions="WIN32,NDEBUG,_LIB"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				EnableFunctionLevelLinking="TRUE"
+				DefaultCharIsUnsigned="TRUE"
+				UsePrecompiledHeader="2"
+				PrecompiledHeaderFile="..\..\..\..\build\msvc_7\source\blender\python\BPY_python.pch"
+				AssemblerListingLocation="..\..\..\..\build\msvc_7\source\blender\python\"
+				ObjectFile="..\..\..\..\build\msvc_7\source\blender\python\"
+				ProgramDataBaseFileName="..\..\..\..\build\msvc_7\source\blender\python\"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				Detect64BitPortabilityProblems="FALSE"
+				CompileAs="0"
+				DisableSpecificWarnings="4100"/>
+			<Tool
+				Name="VCCustomBuildTool"/>

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list