svn merge -r 16174:16215 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Thu, 21 Aug 2008 22:57:25 +0000 (22:57 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Thu, 21 Aug 2008 22:57:25 +0000 (22:57 +0000)
commitf4ae23f3794605f5b7c0a5b90d982d6dfd20d492
tree0f1c725f89be062437f0114d5ef1a2fe501fd600
parenta06321d55c2f25440120ac2fdead20639863a608
svn merge -r 16174:16215 https://svn.blender.org/svnroot/bf-blender/trunk/blender
48 files changed:
extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
release/scripts/flt_dofedit.py [new file with mode: 0644]
release/scripts/flt_lodedit.py [new file with mode: 0644]
release/scripts/flt_properties.py
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_collision.h
source/blender/blenkernel/BKE_effect.h
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/implicit.c
source/blender/blenkernel/intern/ipo.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/include/BIF_resources.h
source/blender/makesdna/DNA_ipo_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_object_force.h
source/blender/makesdna/DNA_particle_types.h
source/blender/makesdna/DNA_userdef_types.h
source/blender/python/api2_2x/Material.c
source/blender/python/api2_2x/Mesh.c
source/blender/python/api2_2x/Object.c
source/blender/python/api2_2x/doc/Material.py
source/blender/python/api2_2x/doc/Object.py
source/blender/src/buttons_object.c
source/blender/src/drawipo.c
source/blender/src/editipo.c
source/blender/src/editipo_lib.c
source/blender/src/resources.c
source/blender/src/space.c
source/blender/src/usiblender.c
source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
source/gameengine/GamePlayer/ghost/GPG_Application.cpp
source/gameengine/GamePlayer/ghost/GPG_Application.h
source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/Ketsji/KX_Scene.cpp
source/gameengine/Ketsji/KX_Scene.h
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
source/gameengine/Physics/Bullet/CcdPhysicsController.h
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
source/gameengine/Physics/Bullet/SConscript
source/gameengine/Physics/common/PHY_DynamicTypes.h