merge from 21113 to 21377
authorLukas Steiblys <imbusy@imbusy.org>
Mon, 6 Jul 2009 14:40:38 +0000 (14:40 +0000)
committerLukas Steiblys <imbusy@imbusy.org>
Mon, 6 Jul 2009 14:40:38 +0000 (14:40 +0000)
commit97c46206c2675f77fd815c562f0d1f93fb61b9a5
tree2b770b1aedab8062907761602db68bdd4b03d158
parent4a92a0796c12f1af9bd3d66e8e8b7a242aec2cf5
parentf08124a3e2e853443d1a2745d66bb9eb0fd4565d
merge from 21113 to 21377
projectfiles_vc9/blender/blender.sln
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/editors/space_view3d/drawobject.c