Blender Git Commit Log
Git Commits -> Revision ed972db
Revision ed972db by Ian Thompson (master) August 9, 2008, 10:12 (GMT) |
Merge from trunk: 15912:16031 |
Commit Details:
Full Hash: ed972db1a3a2aa7f340e4382b4f0094681b34ed3
SVN Revision: 16035
Parent Commit: d7f64d4
Lines Changed: +3669, -1562
2 Added Paths:
/source/blender/blenkernel/BKE_bvhutils.h (+98, -0) (View)
/source/blender/blenkernel/intern/bvhutils.c (+433, -0) (View)
/source/blender/blenkernel/intern/bvhutils.c (+433, -0) (View)
74 Modified Paths:
/CMakeLists.txt (+3, -3) (Diff)
/config/linux2-config.py (+1, -1) (Diff)
/intern/boolop/intern/BOP_Interface.cpp (+1, -1) (Diff)
/intern/boolop/make/msvc_7_0/boolop.vcproj (+9, -0) (Diff)
/intern/boolop/SConscript (+1, -1) (Diff)
/intern/bsp/SConscript (+1, -1) (Diff)
/projectfiles_vc7/blender/blender.sln (+7, -2) (Diff)
/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj (+6, -0) (Diff)
/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj (+108, -0) (Diff)
/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj (+5, -4) (Diff)
/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj (+1, -0) (Diff)
/release/scripts/flt_export.py (+19, -10) (Diff)
/release/scripts/flt_palettemanager.py (+133, -16) (Diff)
/release/scripts/import_dxf.py (+555, -373) (Diff)
/release/scripts/weightpaint_clean.py (+4, -3) (Diff)
/SConstruct (+5, -4) (Diff)
/source/blender/blenkernel/bad_level_call_stubs/stubs.c (+4, -0) (Diff)
/source/blender/blenkernel/BKE_texture.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/anim.c (+2, -10) (Diff)
/source/blender/blenkernel/intern/collision.c (+106, -115) (Diff)
/source/blender/blenkernel/intern/customdata.c (+22, -2) (Diff)
/source/blender/blenkernel/intern/modifier.c (+37, -2) (Diff)
/source/blender/blenkernel/intern/particle.c (+3, -0) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+11, -7) (Diff)
/source/blender/blenkernel/intern/texture.c (+18, -0) (Diff)
/source/blender/blenlib/BLI_kdopbvh.h (+36, -0) (Diff)
/source/blender/blenlib/intern/BLI_kdopbvh.c (+818, -316) (Diff)
/source/blender/blenlib/intern/boxpack2d.c (+6, -4) (Diff)
/source/blender/imbuf/intern/anim.c (+14, -1) (Diff)
/source/blender/include/BIF_editarmature.h (+6, -1) (Diff)
/source/blender/include/BIF_editmesh.h (+1, -1) (Diff)
/source/blender/include/BIF_poseobject.h (+2, -0) (Diff)
/source/blender/include/butspace.h (+1, -1) (Diff)
/source/blender/python/api2_2x/Blender.c (+1, -1) (Diff)
/source/blender/python/api2_2x/Constraint.c (+22, -7) (Diff)
/source/blender/python/api2_2x/doc/Render.py (+2, -2) (Diff)
/source/blender/python/api2_2x/Material.c (+8, -4) (Diff)
/source/blender/python/api2_2x/Mathutils.c (+4, -4) (Diff)
/source/blender/python/api2_2x/Mathutils.h (+1, -1) (Diff)
/source/blender/python/BPY_interface.c (+19, -45) (Diff)
/source/blender/render/intern/source/convertblender.c (+11, -3) (Diff)
/source/blender/src/buttons_editing.c (+38, -50) (Diff)
/source/blender/src/buttons_object.c (+2, -1) (Diff)
/source/blender/src/buttons_scene.c (+10, -1) (Diff)
/source/blender/src/drawgpencil.c (+223, -85) (Diff)
/source/blender/src/drawseq.c (+15, -9) (Diff)
/source/blender/src/editarmature.c (+83, -81) (Diff)
/source/blender/src/editimasel.c (+6, -0) (Diff)
/source/blender/src/editmesh_mods.c (+345, -308) (Diff)
/source/blender/src/editseq.c (+1, -0) (Diff)
/source/blender/src/header_info.c (+46, -3) (Diff)
/source/blender/src/header_view3d.c (+65, -16) (Diff)
/source/blender/src/poselib.c (+5, -2) (Diff)
/source/blender/src/poseobject.c (+61, -0) (Diff)
/source/blender/src/space.c (+15, -2) (Diff)
/source/blender/src/toolbox.c (+6, -3) (Diff)
/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp (+2, -1) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+11, -1) (Diff)
/source/gameengine/Converter/KX_IpoConvert.cpp (+6, -3) (Diff)
/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h (+1, -1) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+7, -1) (Diff)
/source/gameengine/Ketsji/CMakeLists.txt (+13, -1) (Diff)
/source/gameengine/Ketsji/KX_GameObject.cpp (+65, -16) (Diff)
/source/gameengine/Ketsji/KX_GameObject.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+11, -2) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_RadarSensor.cpp (+7, -7) (Diff)
/source/gameengine/Ketsji/KX_TouchEventManager.cpp (+6, -6) (Diff)
/source/gameengine/Ketsji/SConscript (+15, -1) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp (+3, -2) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsController.h (+8, -1) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp (+34, -8) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h (+1, -4) (Diff)
/source/gameengine/PyDoc/KX_GameObject.py (+10, -0) (Diff)
/config/linux2-config.py (+1, -1) (Diff)
/intern/boolop/intern/BOP_Interface.cpp (+1, -1) (Diff)
/intern/boolop/make/msvc_7_0/boolop.vcproj (+9, -0) (Diff)
/intern/boolop/SConscript (+1, -1) (Diff)
/intern/bsp/SConscript (+1, -1) (Diff)
/projectfiles_vc7/blender/blender.sln (+7, -2) (Diff)
/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj (+6, -0) (Diff)
/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj (+108, -0) (Diff)
/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj (+5, -4) (Diff)
/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj (+1, -0) (Diff)
/release/scripts/flt_export.py (+19, -10) (Diff)
/release/scripts/flt_palettemanager.py (+133, -16) (Diff)
/release/scripts/import_dxf.py (+555, -373) (Diff)
/release/scripts/weightpaint_clean.py (+4, -3) (Diff)
/SConstruct (+5, -4) (Diff)
/source/blender/blenkernel/bad_level_call_stubs/stubs.c (+4, -0) (Diff)
/source/blender/blenkernel/BKE_texture.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/anim.c (+2, -10) (Diff)
/source/blender/blenkernel/intern/collision.c (+106, -115) (Diff)
/source/blender/blenkernel/intern/customdata.c (+22, -2) (Diff)
/source/blender/blenkernel/intern/modifier.c (+37, -2) (Diff)
/source/blender/blenkernel/intern/particle.c (+3, -0) (Diff)
/source/blender/blenkernel/intern/particle_system.c (+11, -7) (Diff)
/source/blender/blenkernel/intern/texture.c (+18, -0) (Diff)
/source/blender/blenlib/BLI_kdopbvh.h (+36, -0) (Diff)
/source/blender/blenlib/intern/BLI_kdopbvh.c (+818, -316) (Diff)
/source/blender/blenlib/intern/boxpack2d.c (+6, -4) (Diff)
/source/blender/imbuf/intern/anim.c (+14, -1) (Diff)
/source/blender/include/BIF_editarmature.h (+6, -1) (Diff)
/source/blender/include/BIF_editmesh.h (+1, -1) (Diff)
/source/blender/include/BIF_poseobject.h (+2, -0) (Diff)
/source/blender/include/butspace.h (+1, -1) (Diff)
/source/blender/python/api2_2x/Blender.c (+1, -1) (Diff)
/source/blender/python/api2_2x/Constraint.c (+22, -7) (Diff)
/source/blender/python/api2_2x/doc/Render.py (+2, -2) (Diff)
/source/blender/python/api2_2x/Material.c (+8, -4) (Diff)
/source/blender/python/api2_2x/Mathutils.c (+4, -4) (Diff)
/source/blender/python/api2_2x/Mathutils.h (+1, -1) (Diff)
/source/blender/python/BPY_interface.c (+19, -45) (Diff)
/source/blender/render/intern/source/convertblender.c (+11, -3) (Diff)
/source/blender/src/buttons_editing.c (+38, -50) (Diff)
/source/blender/src/buttons_object.c (+2, -1) (Diff)
/source/blender/src/buttons_scene.c (+10, -1) (Diff)
/source/blender/src/drawgpencil.c (+223, -85) (Diff)
/source/blender/src/drawseq.c (+15, -9) (Diff)
/source/blender/src/editarmature.c (+83, -81) (Diff)
/source/blender/src/editimasel.c (+6, -0) (Diff)
/source/blender/src/editmesh_mods.c (+345, -308) (Diff)
/source/blender/src/editseq.c (+1, -0) (Diff)
/source/blender/src/header_info.c (+46, -3) (Diff)
/source/blender/src/header_view3d.c (+65, -16) (Diff)
/source/blender/src/poselib.c (+5, -2) (Diff)
/source/blender/src/poseobject.c (+61, -0) (Diff)
/source/blender/src/space.c (+15, -2) (Diff)
/source/blender/src/toolbox.c (+6, -3) (Diff)
/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp (+2, -1) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+11, -1) (Diff)
/source/gameengine/Converter/KX_IpoConvert.cpp (+6, -3) (Diff)
/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h (+1, -1) (Diff)
/source/gameengine/GamePlayer/ghost/GPG_Application.cpp (+7, -1) (Diff)
/source/gameengine/Ketsji/CMakeLists.txt (+13, -1) (Diff)
/source/gameengine/Ketsji/KX_GameObject.cpp (+65, -16) (Diff)
/source/gameengine/Ketsji/KX_GameObject.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.cpp (+11, -2) (Diff)
/source/gameengine/Ketsji/KX_PythonInit.h (+1, -0) (Diff)
/source/gameengine/Ketsji/KX_RadarSensor.cpp (+7, -7) (Diff)
/source/gameengine/Ketsji/KX_TouchEventManager.cpp (+6, -6) (Diff)
/source/gameengine/Ketsji/SConscript (+15, -1) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp (+3, -2) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsController.h (+8, -1) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp (+34, -8) (Diff)
/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h (+1, -4) (Diff)
/source/gameengine/PyDoc/KX_GameObject.py (+10, -0) (Diff)