Merge from trunk: 15912:16031
authorIan Thompson <quornian@googlemail.com>
Sat, 9 Aug 2008 10:12:59 +0000 (10:12 +0000)
committerIan Thompson <quornian@googlemail.com>
Sat, 9 Aug 2008 10:12:59 +0000 (10:12 +0000)
commited972db1a3a2aa7f340e4382b4f0094681b34ed3
tree9efb20f7b9b026e7f22abd95f6e0f009b08e802a
parentd7f64d43dd4b6fc89c7c02395b5c0143e63a0d0c
Merge from trunk: 15912:16031
76 files changed:
CMakeLists.txt
SConstruct
config/linux2-config.py
intern/boolop/SConscript
intern/boolop/intern/BOP_Interface.cpp
intern/boolop/make/msvc_7_0/boolop.vcproj
intern/bsp/SConscript
projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
projectfiles_vc7/blender/blender.sln
projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
release/scripts/flt_export.py
release/scripts/flt_palettemanager.py
release/scripts/import_dxf.py
release/scripts/weightpaint_clean.py
source/blender/blenkernel/BKE_bvhutils.h [new file with mode: 0644]
source/blender/blenkernel/BKE_texture.h
source/blender/blenkernel/bad_level_call_stubs/stubs.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/bvhutils.c [new file with mode: 0644]
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/texture.c
source/blender/blenlib/BLI_kdopbvh.h
source/blender/blenlib/intern/BLI_kdopbvh.c
source/blender/blenlib/intern/boxpack2d.c
source/blender/imbuf/intern/anim.c
source/blender/include/BIF_editarmature.h
source/blender/include/BIF_editmesh.h
source/blender/include/BIF_poseobject.h
source/blender/include/butspace.h
source/blender/python/BPY_interface.c
source/blender/python/api2_2x/Blender.c
source/blender/python/api2_2x/Constraint.c
source/blender/python/api2_2x/Material.c
source/blender/python/api2_2x/Mathutils.c
source/blender/python/api2_2x/Mathutils.h
source/blender/python/api2_2x/doc/Render.py
source/blender/render/intern/source/convertblender.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/buttons_scene.c
source/blender/src/drawgpencil.c
source/blender/src/drawseq.c
source/blender/src/editarmature.c
source/blender/src/editimasel.c
source/blender/src/editmesh_mods.c
source/blender/src/editseq.c
source/blender/src/header_info.c
source/blender/src/header_view3d.c
source/blender/src/poselib.c
source/blender/src/poseobject.c
source/blender/src/space.c
source/blender/src/toolbox.c
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Converter/KX_IpoConvert.cpp
source/gameengine/GamePlayer/common/windows/GPW_Canvas.h
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_PythonInit.h
source/gameengine/Ketsji/KX_RadarSensor.cpp
source/gameengine/Ketsji/KX_TouchEventManager.cpp
source/gameengine/Ketsji/SConscript
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
source/gameengine/Physics/Bullet/CcdPhysicsController.h
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
source/gameengine/PyDoc/KX_GameObject.py