[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16118] branches/harmonic-skeleton: merging trunk 15964 -> 16116
Martin Poirier
theeth at yahoo.com
Thu Aug 14 23:16:49 CEST 2008
Revision: 16118
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16118
Author: theeth
Date: 2008-08-14 23:16:48 +0200 (Thu, 14 Aug 2008)
Log Message:
-----------
merging trunk 15964 -> 16116
Modified Paths:
--------------
branches/harmonic-skeleton/CMakeLists.txt
branches/harmonic-skeleton/config/linux2-config.py
branches/harmonic-skeleton/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
branches/harmonic-skeleton/projectfiles_vc7/blender/blender.sln
branches/harmonic-skeleton/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/harmonic-skeleton/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
branches/harmonic-skeleton/release/VERSION
branches/harmonic-skeleton/release/datafiles/splash.jpg
branches/harmonic-skeleton/release/scripts/bpymodules/colladaImEx/collada.py
branches/harmonic-skeleton/release/scripts/bpymodules/colladaImEx/cstartup.py
branches/harmonic-skeleton/release/scripts/bpymodules/colladaImEx/helperObjects.py
branches/harmonic-skeleton/release/scripts/bpymodules/colladaImEx/translator.py
branches/harmonic-skeleton/release/scripts/bpymodules/colladaImEx/xmlUtils.py
branches/harmonic-skeleton/release/scripts/flt_export.py
branches/harmonic-skeleton/release/scripts/flt_palettemanager.py
branches/harmonic-skeleton/release/scripts/import_dxf.py
branches/harmonic-skeleton/release/scripts/ply_export.py
branches/harmonic-skeleton/source/blender/blenkernel/BKE_blender.h
branches/harmonic-skeleton/source/blender/blenkernel/BKE_texture.h
branches/harmonic-skeleton/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/harmonic-skeleton/source/blender/blenkernel/intern/anim.c
branches/harmonic-skeleton/source/blender/blenkernel/intern/modifier.c
branches/harmonic-skeleton/source/blender/blenkernel/intern/particle_system.c
branches/harmonic-skeleton/source/blender/blenkernel/intern/softbody.c
branches/harmonic-skeleton/source/blender/blenkernel/intern/texture.c
branches/harmonic-skeleton/source/blender/blenlib/BLI_kdopbvh.h
branches/harmonic-skeleton/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/harmonic-skeleton/source/blender/include/BIF_editarmature.h
branches/harmonic-skeleton/source/blender/include/BIF_editmesh.h
branches/harmonic-skeleton/source/blender/include/butspace.h
branches/harmonic-skeleton/source/blender/python/BPY_interface.c
branches/harmonic-skeleton/source/blender/python/api2_2x/Blender.c
branches/harmonic-skeleton/source/blender/python/api2_2x/Constraint.c
branches/harmonic-skeleton/source/blender/python/api2_2x/Mathutils.c
branches/harmonic-skeleton/source/blender/python/api2_2x/Mathutils.h
branches/harmonic-skeleton/source/blender/python/api2_2x/Texture.c
branches/harmonic-skeleton/source/blender/python/api2_2x/doc/Render.py
branches/harmonic-skeleton/source/blender/python/api2_2x/doc/Texture.py
branches/harmonic-skeleton/source/blender/render/intern/source/rayshade.c
branches/harmonic-skeleton/source/blender/src/buttons_editing.c
branches/harmonic-skeleton/source/blender/src/buttons_object.c
branches/harmonic-skeleton/source/blender/src/editarmature.c
branches/harmonic-skeleton/source/blender/src/editmesh_mods.c
branches/harmonic-skeleton/source/blender/src/editobject.c
branches/harmonic-skeleton/source/blender/src/header_view3d.c
branches/harmonic-skeleton/source/blender/src/poselib.c
branches/harmonic-skeleton/source/blender/src/splash.jpg.c
branches/harmonic-skeleton/source/blender/src/transform_conversions.c
branches/harmonic-skeleton/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/harmonic-skeleton/source/gameengine/Converter/BL_ActionActuator.cpp
branches/harmonic-skeleton/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/harmonic-skeleton/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/harmonic-skeleton/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/harmonic-skeleton/source/gameengine/Converter/KX_IpoConvert.cpp
branches/harmonic-skeleton/source/gameengine/Expressions/InputParser.cpp
branches/harmonic-skeleton/source/gameengine/Expressions/ListValue.cpp
branches/harmonic-skeleton/source/gameengine/Expressions/PyObjectPlus.cpp
branches/harmonic-skeleton/source/gameengine/Expressions/PyObjectPlus.h
branches/harmonic-skeleton/source/gameengine/Expressions/Value.cpp
branches/harmonic-skeleton/source/gameengine/Expressions/Value.h
branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/harmonic-skeleton/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/harmonic-skeleton/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
branches/harmonic-skeleton/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/harmonic-skeleton/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/BL_Shader.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/CMakeLists.txt
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_CameraActuator.h
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_GameObject.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_GameObject.h
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_ParentActuator.h
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_PythonInit.h
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/harmonic-skeleton/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/harmonic-skeleton/source/gameengine/Ketsji/SConscript
branches/harmonic-skeleton/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/harmonic-skeleton/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/harmonic-skeleton/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/harmonic-skeleton/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/harmonic-skeleton/source/gameengine/PyDoc/KX_CameraActuator.py
branches/harmonic-skeleton/source/gameengine/PyDoc/KX_ParentActuator.py
branches/harmonic-skeleton/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
branches/harmonic-skeleton/source/gameengine/PyDoc/KX_TrackToActuator.py
branches/harmonic-skeleton/tools/btools.py
Removed Paths:
-------------
branches/harmonic-skeleton/release/text/release_246.txt
Modified: branches/harmonic-skeleton/CMakeLists.txt
===================================================================
--- branches/harmonic-skeleton/CMakeLists.txt 2008-08-14 19:16:55 UTC (rev 16117)
+++ branches/harmonic-skeleton/CMakeLists.txt 2008-08-14 21:16:48 UTC (rev 16118)
@@ -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/harmonic-skeleton/config/linux2-config.py
===================================================================
--- branches/harmonic-skeleton/config/linux2-config.py 2008-08-14 19:16:55 UTC (rev 16117)
+++ branches/harmonic-skeleton/config/linux2-config.py 2008-08-14 21:16:48 UTC (rev 16118)
@@ -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/harmonic-skeleton/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
===================================================================
--- branches/harmonic-skeleton/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj 2008-08-14 19:16:55 UTC (rev 16117)
+++ branches/harmonic-skeleton/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj 2008-08-14 21:16:48 UTC (rev 16118)
@@ -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/harmonic-skeleton/projectfiles_vc7/blender/blender.sln
===================================================================
--- branches/harmonic-skeleton/projectfiles_vc7/blender/blender.sln 2008-08-14 19:16:55 UTC (rev 16117)
+++ branches/harmonic-skeleton/projectfiles_vc7/blender/blender.sln 2008-08-14 21:16:48 UTC (rev 16118)
@@ -152,6 +152,7 @@
{E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B} = {E109F1A5-FDD3-4F56-A1C4-96867EEA4C5B}
{727F90AC-ABE6-40BF-8937-C2F2F1D13DEA} = {727F90AC-ABE6-40BF-8937-C2F2F1D13DEA}
{E90C7BC2-CF30-4A60-A8F2-0050D592E358} = {E90C7BC2-CF30-4A60-A8F2-0050D592E358}
+ {5A2EA6DC-1A53-4E87-9166-52870CE3B4EA} = {5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}
{32CC75E2-EE85-45E6-8E3D-513F58464F43} = {32CC75E2-EE85-45E6-8E3D-513F58464F43}
{9A307EE5-CD77-47BC-BD87-62508C7E19D8} = {9A307EE5-CD77-47BC-BD87-62508C7E19D8}
{AB590CED-F71F-4A17-A89B-18583ECD633D} = {AB590CED-F71F-4A17-A89B-18583ECD633D}
@@ -248,6 +249,8 @@
Debug = Debug
Release = Release
EndGlobalSection
+ GlobalSection(ProjectDependencies) = postSolution
+ EndGlobalSection
GlobalSection(ProjectConfiguration) = postSolution
{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.3D Plugin Debug.ActiveCfg = Blender Debug|Win32
{F78B7FC9-DE32-465E-9F26-BB0B6B7A2EAF}.3D Plugin Release.ActiveCfg = Blender Release|Win32
@@ -387,8 +390,10 @@
{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.Blender Debug.Build.0 = Blender Debug|Win32
{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.Blender Release.ActiveCfg = Blender Release|Win32
{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.Blender Release.Build.0 = Blender Release|Win32
- {5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.BlenderPlayer Debug.ActiveCfg = Blender Debug|Win32
- {5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.BlenderPlayer Release.ActiveCfg = Blender Release|Win32
+ {5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.BlenderPlayer Debug.ActiveCfg = BlenderPlayer Debug|Win32
+ {5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.BlenderPlayer Debug.Build.0 = BlenderPlayer Debug|Win32
+ {5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.BlenderPlayer Release.ActiveCfg = BlenderPlayer Release|Win32
+ {5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.BlenderPlayer Release.Build.0 = BlenderPlayer Release|Win32
{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.Debug.ActiveCfg = Blender Debug|Win32
{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.Debug.Build.0 = Blender Debug|Win32
{5A2EA6DC-1A53-4E87-9166-52870CE3B4EA}.Release.ActiveCfg = Blender Release|Win32
Modified: branches/harmonic-skeleton/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
===================================================================
--- branches/harmonic-skeleton/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj 2008-08-14 19:16:55 UTC (rev 16117)
+++ branches/harmonic-skeleton/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj 2008-08-14 21:16:48 UTC (rev 16118)
@@ -366,6 +366,9 @@
RelativePath="..\..\..\source\blender\blenkernel\intern\brush.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenkernel\intern\bvhutils.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenkernel\intern\CCGSubSurf.c">
</File>
<File
@@ -577,6 +580,9 @@
RelativePath="..\..\..\source\blender\blenkernel\BKE_brush.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenkernel\BKE_bvhutils.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenkernel\BKE_cdderivedmesh.h">
</File>
<File
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list