Tuesday merger of bf-blender into orange branch.
authorTon Roosendaal <ton@blender.org>
Tue, 10 Jan 2006 22:10:14 +0000 (22:10 +0000)
committerTon Roosendaal <ton@blender.org>
Tue, 10 Jan 2006 22:10:14 +0000 (22:10 +0000)
commite7285229b824f959f84efe6774c506034cf0f98e
treef4c96dae29629cc5e5b1c335d93abc82647a11c5
parentd594594cbe9c9eb3bc3c8a7708601e68693d324d
parent185c6bb49ce994d66fc67673b01a014161fa307d
Tuesday merger of bf-blender into orange branch.
27 files changed:
extern/bullet/Bullet/CollisionShapes/ConvexTriangleCallback.h
extern/bullet/Bullet/CollisionShapes/OptimizedBvh.h
extern/bullet/Bullet/CollisionShapes/TriangleCallback.cpp
extern/bullet/Bullet/CollisionShapes/TriangleIndexVertexArray.h
extern/bullet/Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp
source/blender/blenkernel/BKE_global.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/ipo.c
source/blender/makesdna/DNA_scene_types.h
source/blender/python/api2_2x/Object.c
source/blender/renderconverter/intern/convertBlenderScene.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_scene.c
source/blender/src/drawview.c
source/blender/src/editaction.c
source/blender/src/editconstraint.c
source/blender/src/editipo.c
source/blender/src/editobject.c
source/blender/src/editsima.c
source/blender/src/header_image.c
source/blender/src/header_info.c
source/blender/src/interface.c
source/blender/src/space.c
source/blender/src/toolbox.c
source/gameengine/Ketsji/KX_GameObject.cpp
source/nan_definitions.mk