svn merge -r 15908:15988 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Wed, 6 Aug 2008 16:50:07 +0000 (16:50 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Wed, 6 Aug 2008 16:50:07 +0000 (16:50 +0000)
commit523634ca17a392a49e324244ee6f35ac2359544b
tree38a0b55844b78c4750dfb5de9673ff34b60aa2e4
parente57c5ef56c306fe495346525fb9d1f9bcf8cfd2b
svn merge -r 15908:15988 https://svn.blender.org/svnroot/bf-blender/trunk/blender
58 files changed:
SConstruct
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/gameengine/ketsji/KX_ketsji.vcproj
projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
release/scripts/import_dxf.py
release/scripts/weightpaint_clean.py
source/blender/blenkernel/BKE_texture.h
source/blender/blenkernel/bad_level_call_stubs/stubs.c
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/texture.c
source/blender/blenlib/intern/BLI_kdopbvh.c
source/blender/blenlib/intern/boxpack2d.c
source/blender/blenloader/intern/writefile.c
source/blender/imbuf/intern/anim.c
source/blender/include/BIF_editarmature.h
source/blender/include/BIF_poseobject.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/render/intern/source/convertblender.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/editseq.c
source/blender/src/header_info.c
source/blender/src/header_view3d.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/KX_IpoConvert.cpp
source/gameengine/GamePlayer/common/windows/GPW_Canvas.h
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
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_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