Revision: 15989
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15989
Author: jaguarandi
Date: 2008-08-06 18:50:07 +0200 (Wed, 06 Aug 2008)
Log Message:
-----------
svn merge -r 15908:15988
https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2008-jaguarandi/SConstruct
branches/soc-2008-jaguarandi/intern/boolop/SConscript
branches/soc-2008-jaguarandi/intern/boolop/intern/BOP_Interface.cpp
branches/soc-2008-jaguarandi/intern/boolop/make/msvc_7_0/boolop.vcproj
branches/soc-2008-jaguarandi/intern/bsp/SConscript
branches/soc-2008-jaguarandi/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
branches/soc-2008-jaguarandi/projectfiles_vc7/blender/blender.sln
branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
branches/soc-2008-jaguarandi/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
branches/soc-2008-jaguarandi/release/scripts/bpymodules/colladaImEx/collada.py
branches/soc-2008-jaguarandi/release/scripts/bpymodules/colladaImEx/cstartup.py
branches/soc-2008-jaguarandi/release/scripts/bpymodules/colladaImEx/helperObjects.py
branches/soc-2008-jaguarandi/release/scripts/bpymodules/colladaImEx/translator.py
branches/soc-2008-jaguarandi/release/scripts/bpymodules/colladaImEx/xmlUtils.py
branches/soc-2008-jaguarandi/release/scripts/import_dxf.py
branches/soc-2008-jaguarandi/release/scripts/weightpaint_clean.py
branches/soc-2008-jaguarandi/source/blender/blenkernel/BKE_texture.h
branches/soc-2008-jaguarandi/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/collision.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/particle.c
branches/soc-2008-jaguarandi/source/blender/blenkernel/intern/texture.c
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2008-jaguarandi/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2008-jaguarandi/source/blender/blenloader/intern/writefile.c
branches/soc-2008-jaguarandi/source/blender/imbuf/intern/anim.c
branches/soc-2008-jaguarandi/source/blender/include/BIF_editarmature.h
branches/soc-2008-jaguarandi/source/blender/include/BIF_poseobject.h
branches/soc-2008-jaguarandi/source/blender/python/BPY_interface.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Blender.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Constraint.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Material.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Mathutils.c
branches/soc-2008-jaguarandi/source/blender/python/api2_2x/Mathutils.h
branches/soc-2008-jaguarandi/source/blender/render/intern/source/convertblender.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_object.c
branches/soc-2008-jaguarandi/source/blender/src/buttons_scene.c
branches/soc-2008-jaguarandi/source/blender/src/drawgpencil.c
branches/soc-2008-jaguarandi/source/blender/src/drawseq.c
branches/soc-2008-jaguarandi/source/blender/src/editarmature.c
branches/soc-2008-jaguarandi/source/blender/src/editimasel.c
branches/soc-2008-jaguarandi/source/blender/src/editseq.c
branches/soc-2008-jaguarandi/source/blender/src/header_info.c
branches/soc-2008-jaguarandi/source/blender/src/header_view3d.c
branches/soc-2008-jaguarandi/source/blender/src/poseobject.c
branches/soc-2008-jaguarandi/source/blender/src/space.c
branches/soc-2008-jaguarandi/source/blender/src/toolbox.c
branches/soc-2008-jaguarandi/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-jaguarandi/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h
branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2008-jaguarandi/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_PythonInit.h
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/soc-2008-jaguarandi/source/gameengine/Ketsji/SConscript
branches/soc-2008-jaguarandi/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-jaguarandi/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2008-jaguarandi/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2008-jaguarandi/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2008-jaguarandi/source/gameengine/PyDoc/KX_GameObject.py
Modified: branches/soc-2008-jaguarandi/SConstruct
===================================================================
--- branches/soc-2008-jaguarandi/SConstruct 2008-08-06 15:46:38 UTC (rev
15988)
+++ branches/soc-2008-jaguarandi/SConstruct 2008-08-06 16:50:07 UTC (rev
15989)
@@ -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-jaguarandi/intern/boolop/SConscript
===================================================================
--- branches/soc-2008-jaguarandi/intern/boolop/SConscript 2008-08-06
15:46:38 UTC (rev 15988)
+++ branches/soc-2008-jaguarandi/intern/boolop/SConscript 2008-08-06
16:50:07 UTC (rev 15989)
@@ -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-jaguarandi/intern/boolop/intern/BOP_Interface.cpp
===================================================================
--- branches/soc-2008-jaguarandi/intern/boolop/intern/BOP_Interface.cpp
2008-08-06 15:46:38 UTC (rev 15988)
+++ branches/soc-2008-jaguarandi/intern/boolop/intern/BOP_Interface.cpp
2008-08-06 16:50:07 UTC (rev 15989)
@@ -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-jaguarandi/intern/boolop/make/msvc_7_0/boolop.vcproj
===================================================================
--- branches/soc-2008-jaguarandi/intern/boolop/make/msvc_7_0/boolop.vcproj
2008-08-06 15:46:38 UTC (rev 15988)
+++ branches/soc-2008-jaguarandi/intern/boolop/make/msvc_7_0/boolop.vcproj
2008-08-06 16:50:07 UTC (rev 15989)
@@ -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-jaguarandi/intern/bsp/SConscript
===================================================================
--- branches/soc-2008-jaguarandi/intern/bsp/SConscript 2008-08-06 15:46:38 UTC
(rev 15988)
+++ branches/soc-2008-jaguarandi/intern/bsp/SConscript 2008-08-06 16:50:07 UTC
(rev 15989)
@@ -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-jaguarandi/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
===================================================================
---
branches/soc-2008-jaguarandi/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
2008-08-06 15:46:38 UTC (rev 15988)
+++
branches/soc-2008-jaguarandi/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
2008-08-06 16:50:07 UTC (rev 15989)
@@ -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"/>
+ <Tool
+ Name="VCLibrarianTool"
+
OutputFile="..\..\..\..\build\msvc_7\libs\BPY_python.lib"
+ SuppressStartupBanner="TRUE"/>
+ <Tool
+ Name="VCMIDLTool"/>
+ <Tool
+ Name="VCPostBuildEventTool"/>
+ <Tool
+ Name="VCPreBuildEventTool"/>
+ <Tool
+ Name="VCPreLinkEventTool"/>
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"/>
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"/>
+ <Tool
+ Name="VCXMLDataGeneratorTool"/>
+ <Tool
+ Name="VCManagedWrapperGeneratorTool"/>
+ <Tool
+ Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ </Configuration>
</Configurations>
<References>
</References>
Modified: branches/soc-2008-jaguarandi/projectfiles_vc7/blender/blender.sln
===================================================================
--- branches/soc-2008-jaguarandi/projectfiles_vc7/blender/blender.sln
2008-08-06 15:46:38 UTC (rev 15988)
+++ branches/soc-2008-jaguarandi/projectfiles_vc7/blender/blender.sln
2008-08-06 16:50:07 UTC (rev 15989)
@@ -152,6 +152,7 @@
{E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B} =
{E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B}
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
