[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15522] branches/soc-2008-unclezeiv: svn merge -r 15402:15521 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Davide Vercelli
davide.vercelli at gmail.com
Thu Jul 10 18:07:23 CEST 2008
Revision: 15522
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15522
Author: unclezeiv
Date: 2008-07-10 18:07:23 +0200 (Thu, 10 Jul 2008)
Log Message:
-----------
svn merge -r 15402:15521 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-unclezeiv/intern/moto/include/GEN_Map.h
branches/soc-2008-unclezeiv/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
branches/soc-2008-unclezeiv/projectfiles_vc7/blender/render/BRE_render.vcproj
branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
branches/soc-2008-unclezeiv/release/scripts/animation_bake_constraints.py
branches/soc-2008-unclezeiv/release/scripts/c3d_import.py
branches/soc-2008-unclezeiv/release/windows/installer/00.sconsblender.nsi
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_bmeshCustomData.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_cloth.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/BME_Customdata.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/BME_conversions.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/BME_eulers.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/BME_mesh.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/BME_structure.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/BME_tools.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/bmesh_private.h
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/cloth.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/collision.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/image.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/implicit.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/library.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/object.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/particle.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-unclezeiv/source/blender/blenkernel/intern/sca.c
branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_arithb.h
branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_winstuff.h
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/arithb.c
branches/soc-2008-unclezeiv/source/blender/blenloader/intern/readfile.c
branches/soc-2008-unclezeiv/source/blender/blenloader/intern/writefile.c
branches/soc-2008-unclezeiv/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/soc-2008-unclezeiv/source/blender/include/BDR_drawobject.h
branches/soc-2008-unclezeiv/source/blender/include/BIF_editarmature.h
branches/soc-2008-unclezeiv/source/blender/include/BSE_sequence.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2008-unclezeiv/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-unclezeiv/source/blender/nodes/intern/CMP_nodes/CMP_gamma.c
branches/soc-2008-unclezeiv/source/blender/python/BPY_interface.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/matrix.c
branches/soc-2008-unclezeiv/source/blender/python/api2_2x/sceneSequence.c
branches/soc-2008-unclezeiv/source/blender/radiosity/intern/source/radrender.c
branches/soc-2008-unclezeiv/source/blender/render/intern/include/pixelshading.h
branches/soc-2008-unclezeiv/source/blender/render/intern/include/render_types.h
branches/soc-2008-unclezeiv/source/blender/render/intern/source/convertblender.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/pixelshading.c
branches/soc-2008-unclezeiv/source/blender/render/intern/source/rendercore.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_logic.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_object.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_scene.c
branches/soc-2008-unclezeiv/source/blender/src/buttons_shading.c
branches/soc-2008-unclezeiv/source/blender/src/drawarmature.c
branches/soc-2008-unclezeiv/source/blender/src/drawimage.c
branches/soc-2008-unclezeiv/source/blender/src/drawobject.c
branches/soc-2008-unclezeiv/source/blender/src/drawview.c
branches/soc-2008-unclezeiv/source/blender/src/editarmature.c
branches/soc-2008-unclezeiv/source/blender/src/editmesh_add.c
branches/soc-2008-unclezeiv/source/blender/src/editnla.c
branches/soc-2008-unclezeiv/source/blender/src/editseq.c
branches/soc-2008-unclezeiv/source/blender/src/editsima.c
branches/soc-2008-unclezeiv/source/blender/src/edittime.c
branches/soc-2008-unclezeiv/source/blender/src/header_image.c
branches/soc-2008-unclezeiv/source/blender/src/header_view3d.c
branches/soc-2008-unclezeiv/source/blender/src/headerbuttons.c
branches/soc-2008-unclezeiv/source/blender/src/interface_draw.c
branches/soc-2008-unclezeiv/source/blender/src/sequence.c
branches/soc-2008-unclezeiv/source/blender/src/space.c
branches/soc-2008-unclezeiv/source/blender/src/transform_conversions.c
branches/soc-2008-unclezeiv/source/blender/src/transform_snap.c
branches/soc-2008-unclezeiv/source/blender/src/usiblender.c
branches/soc-2008-unclezeiv/source/blender/src/view.c
branches/soc-2008-unclezeiv/source/blender/src/vpaint.c
branches/soc-2008-unclezeiv/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_MeshDeformer.h
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_ShapeDeformer.h
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_SkinMeshObject.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/BL_SkinMeshObject.h
branches/soc-2008-unclezeiv/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2008-unclezeiv/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2008-unclezeiv/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_EventManager.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_EventManager.h
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_IActuator.h
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_IController.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ILogicBrick.h
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_IObject.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_IObject.h
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ISensor.h
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_MouseSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_PropertySensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_PythonController.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/BL_Material.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/BL_Material.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_IPO_SGController.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_IpoActuator.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Light.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/soc-2008-unclezeiv/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/PyDoc/BL_ActionActuator.py
branches/soc-2008-unclezeiv/source/gameengine/PyDoc/KX_GameObject.py
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_TexVert.cpp
branches/soc-2008-unclezeiv/source/gameengine/Rasterizer/RAS_TexVert.h
branches/soc-2008-unclezeiv/source/gameengine/SceneGraph/SG_Controller.h
branches/soc-2008-unclezeiv/source/kernel/gen_system/GEN_HashedPtr.h
branches/soc-2008-unclezeiv/source/kernel/gen_system/GEN_Map.h
branches/soc-2008-unclezeiv/tools/Blender.py
Added Paths:
-----------
branches/soc-2008-unclezeiv/source/blender/blenlib/BLI_mempool.h
branches/soc-2008-unclezeiv/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2008-unclezeiv/source/blender/render/intern/include/sunsky.h
branches/soc-2008-unclezeiv/source/blender/render/intern/source/sunsky.c
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/soc-2008-unclezeiv/source/gameengine/GameLogic/SCA_ActuatorSensor.h
Modified: branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_SystemWin32.cpp 2008-07-10 15:30:35 UTC (rev 15521)
+++ branches/soc-2008-unclezeiv/intern/ghost/intern/GHOST_SystemWin32.cpp 2008-07-10 16:07:23 UTC (rev 15522)
@@ -302,6 +302,15 @@
{
GHOST_TSuccess success = GHOST_System::init();
+ /* Disable scaling on high DPI displays on Vista */
+ HMODULE user32 = ::LoadLibraryA("user32.dll");
+ typedef BOOL (WINAPI * LPFNSETPROCESSDPIAWARE)();
+ LPFNSETPROCESSDPIAWARE SetProcessDPIAware =
+ (LPFNSETPROCESSDPIAWARE)GetProcAddress(user32, "SetProcessDPIAware");
+ if (SetProcessDPIAware)
+ SetProcessDPIAware();
+ FreeLibrary(user32);
+
// Determine whether this system has a high frequency performance counter. */
m_hasPerformanceCounter = ::QueryPerformanceFrequency((LARGE_INTEGER*)&m_freq) == TRUE;
if (m_hasPerformanceCounter) {
Modified: branches/soc-2008-unclezeiv/intern/moto/include/GEN_Map.h
===================================================================
--- branches/soc-2008-unclezeiv/intern/moto/include/GEN_Map.h 2008-07-10 15:30:35 UTC (rev 15521)
+++ branches/soc-2008-unclezeiv/intern/moto/include/GEN_Map.h 2008-07-10 16:07:23 UTC (rev 15522)
@@ -82,6 +82,24 @@
}
return 0;
}
+
+ Key* getKey(int index) {
+ int count=0;
+ for (int i=0;i<m_num_buckets;i++)
+ {
+ Entry* bucket = m_buckets[i];
+ while(bucket)
+ {
+ if (count==index)
+ {
+ return &bucket->m_key;
+ }
+ bucket = bucket->m_next;
+ count++;
+ }
+ }
+ return 0;
+ }
void clear() {
for (int i = 0; i < m_num_buckets; ++i) {
Modified: branches/soc-2008-unclezeiv/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj
===================================================================
--- branches/soc-2008-unclezeiv/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj 2008-07-10 15:30:35 UTC (rev 15521)
+++ branches/soc-2008-unclezeiv/projectfiles_vc7/blender/blenlib/BLI_blenlib.vcproj 2008-07-10 16:07:23 UTC (rev 15522)
@@ -359,6 +359,9 @@
RelativePath="..\..\..\source\blender\blenlib\intern\BLI_memarena.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenlib\intern\BLI_mempool.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\intern\boxpack2d.c">
</File>
<File
@@ -474,6 +477,9 @@
RelativePath="..\..\..\source\blender\blenlib\BLI_memarena.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\blenlib\BLI_mempool.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\blenlib\intern\BLI_scanfill.h">
</File>
<File
Modified: branches/soc-2008-unclezeiv/projectfiles_vc7/blender/render/BRE_render.vcproj
===================================================================
--- branches/soc-2008-unclezeiv/projectfiles_vc7/blender/render/BRE_render.vcproj 2008-07-10 15:30:35 UTC (rev 15521)
+++ branches/soc-2008-unclezeiv/projectfiles_vc7/blender/render/BRE_render.vcproj 2008-07-10 16:07:23 UTC (rev 15522)
@@ -74,7 +74,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\..\..\lib\windows\sdl\include;..\..\..\..\build\msvc_7\intern\guardedalloc\include;..\..\..\source\blender;..\..\..\source\blender\misc;..\..\..\source\blender\imbuf;..\..\..\source\blender\yafray;..\..\..\source\blender\blenlib;..\..\..\source\blender\include;..\..\..\source\blender\python;..\..\..\source\blender\blenkernel;..\..\..\source\blender\quicktime;..\..\..\source\blender\blenloader;..\..\..\source\blender\makesdna;..\..\..\source\blender\radiosity\extern\include;..\..\..\source\blender\render\intern\include;..\..\..\source\blender\render\extern\include;..\..\..\source\kernel;..\..\..\source\kernel\gen_messaging"
- PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR"
+ PreprocessorDefinitions="_DEBUG;WIN32;_LIB;WITH_QUICKTIME;WITH_OPENEXR;_USE_MATH_DEFINES"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
DefaultCharIsUnsigned="TRUE"
@@ -176,6 +176,9 @@
RelativePath="..\..\..\source\blender\render\intern\source\strand.c">
</File>
<File
+ RelativePath="..\..\..\source\blender\render\intern\source\sunsky.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\render\intern\source\texture.c">
</File>
<File
@@ -246,6 +249,9 @@
RelativePath="..\..\..\source\blender\render\intern\include\strand.h">
</File>
<File
+ RelativePath="..\..\..\source\blender\render\intern\include\sunsky.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\render\intern\include\texture.h">
</File>
<File
Modified: branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
===================================================================
--- branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj 2008-07-10 15:30:35 UTC (rev 15521)
+++ branches/soc-2008-unclezeiv/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj 2008-07-10 16:07:23 UTC (rev 15522)
@@ -333,6 +333,12 @@
RelativePath="..\..\..\source\gameengine\GameLogic\SCA_2DFilterActuator.cpp">
</File>
<File
+ RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ActuatorEventManager.cpp">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ActuatorSensor.cpp">
+ </File>
+ <File
RelativePath="..\..\..\source\gameengine\GameLogic\SCA_AlwaysEventManager.cpp">
</File>
<File
@@ -445,6 +451,12 @@
RelativePath="..\..\..\source\gameengine\GameLogic\SCA_2DFilterActuator.h">
</File>
<File
+ RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ActuatorEventManager.h">
+ </File>
+ <File
+ RelativePath="..\..\..\source\gameengine\GameLogic\SCA_ActuatorSensor.h">
+ </File>
+ <File
RelativePath="..\..\..\source\gameengine\GameLogic\SCA_AlwaysEventManager.h">
</File>
<File
Modified: branches/soc-2008-unclezeiv/release/scripts/animation_bake_constraints.py
===================================================================
--- branches/soc-2008-unclezeiv/release/scripts/animation_bake_constraints.py 2008-07-10 15:30:35 UTC (rev 15521)
+++ branches/soc-2008-unclezeiv/release/scripts/animation_bake_constraints.py 2008-07-10 16:07:23 UTC (rev 15522)
@@ -1,800 +1,792 @@
-#!BPY
-
-"""
-Name: 'Bake Constraints'
-Blender: 246
-Group: 'Animation'
-Tooltip: 'Bake a Constrained object/rig to IPOs'
-Fillename: 'Bake_Constraint.py'
-"""
-
-__author__ = "Roger Wickes (rogerwickes(at)yahoo.com)"
-__script__ = "Bake Constraints"
-__version__ = "0.6"
-__url__ = ["Communicate problems and errors, http://www.blenderartists.com/forum/private.php?do=newpm to PapaSmurf"]
-__email__= ["Roger Wickes, rogerwickes at yahoo.com", "scripts"]
-__bpydoc__ = """\
-
-bake_constraints
-
-This script bakes the real-world LocRot of an object (the net effect of any constraints -
-(Copy, Limit, Track, Follow, - that affect Location, Rotation)
-(usually one constrained to match another's location and/or Tracked to another)
-and creates a clone with a set of Ipo Curves named Ipo<objname>
-These curves control a non-constrained object and thus make it mimic the constrained object
-Actions can be then be edited without the need for the drivers/constraining objects
-
-Developed for use with MoCap data, where a bone is constrained to point at an empty
-moving through space and time. This records the actual locrot of the armature
-so that the motion can be edited, reoriented, scaled, and used as NLA Actions
-
-see also wiki Scripts/Manual/ Sandbox/Animation/Bake_Constraints (tbd)
-
-Usage:<br>
- - Select the reference Object(s) you want to bake <br>
- - Set the frame range to bake in the Anim Panel <br>
- - Set the test code (if you want a self-test) in the RT field in the Anim Panel <br>
- -- Set RT:1 in the Anim panel to create a test armature <br>
-<br>
- - Run the script <br>
- - The clone copy of the object is created and it has an IPO curve assigned to it.
- - The clone shadows the object by an offset locrot (see usrDelta)
- - That Ipo has Location and Rotation curves that make the shadow mimic the movement of the selected object,
- but without using constraints. Bones move identically in relation to the armature as the reference object
-
-
-Version History:
- 0.1: bakes Loc Rot for a constrained object
- 0.2: bakes Loc and Rot for the bones within Armature object
- 0.3: UI for setting options
- 0.3.1 add manual to script library
- 0.4: bake multiple objects
- 0.5: root bone worldspace rotation
- 0.6: re-integration with BPyArmature
-
-License, Copyright, and Attribution:
- by Roger WICKES May 2008, released under Blender Artistic Licence to Public Domain
- feel free to add to any Blender Python Scripts Bundle.
- Thanks to Jean-Baptiste PERIN, IdeasMan42 (Campbell Barton?), Basil_Fawlty/Cage_drei (Andrew Cruse)
- much lifted/learned from blender.org/documentation/245PytonDoc and wiki
- some modules based on c3D_Import.py, PoseLib16.py and IPO/Armature code examples e.g. camera jitter
-
-Pseudocode (planned versions):
- Initialize
- If at least one object is selected
- For each selected object,
- create a shadow object
- remove any constraints on the clone
- create or reset an ipo curve named like the object
- for each frame
- set the clone's locrot key based on the reference object
- if it's an armature,
- create an action (which is an Ipo for each bone)
- for each frame of the animation
- for each bone in the armature
- set the key
- Else you're a smurf
-
-Test Conditions and Regressions:
- 1. (v0.1) Non-armatures (the cube), with ipo curve and constraints at the object level
- 2. armatures, with ipo curve and constraints at the object level
- 3. armatures, with bones that have ipo curves and constraints
-
-Naming conventions:
- arm = a specific objec type armature
- bone = bones that make up the skeleton of an armature
-
- ob = object, an instance of an object type
- ebone = edit bone, a bone in edit mode
- pbone = pose bone, a posed bone in an object
- tst = testing, self-test routines
- usr = user-entered or designated stuff
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list