Orange; merger with bf-blender.
authorTon Roosendaal <ton@blender.org>
Tue, 3 Jan 2006 21:43:31 +0000 (21:43 +0000)
committerTon Roosendaal <ton@blender.org>
Tue, 3 Jan 2006 21:43:31 +0000 (21:43 +0000)
commitf47899fc0f716464625f43045458e222ce11603d
tree1051359e7eb24a5d40826a0ea7aaa925da7d92c0
parent9557c3a66dccc357f7a8cfecca8e23639208afd2
parent14d5cd1c3145e6f7d6645e1d9623eb9d5d244ad9
Orange; merger with bf-blender.

(Merging is *not* fun work, especially not with bugfixes in main branch
for code that got cleaned up in the other! Poor Hos... :)
26 files changed:
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenloader/intern/readfile.c
source/blender/include/BIF_editarmature.h
source/blender/include/BIF_meshtools.h
source/blender/include/BIF_space.h
source/blender/python/api2_2x/Armature.c
source/blender/python/api2_2x/Object.c
source/blender/render/intern/source/envmap.c
source/blender/render/intern/source/texture.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_shading.c
source/blender/src/drawobject.c
source/blender/src/drawoops.c
source/blender/src/edit.c
source/blender/src/editarmature.c
source/blender/src/editmesh.c
source/blender/src/editmesh_mods.c
source/blender/src/editmesh_tools.c
source/blender/src/editobject.c
source/blender/src/header_ipo.c
source/blender/src/header_view3d.c
source/blender/src/meshtools.c
source/blender/src/renderwin.c
source/blender/src/space.c
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h