svn merge -r39765:39781 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 30 Aug 2011 00:23:11 +0000 (00:23 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 30 Aug 2011 00:23:11 +0000 (00:23 +0000)
commitc5a3f361a008f9b84e88dae4cfbd556d3a3ca76c
tree35380486c3f0675924bb241d9c01565ca8f04dba
parentc9063388bf374978e0dda7e5f82141d5de3cdb62
parent099760cf1f7969d1cd16c6b5bd1a77d86bc62547
svn merge -r39765:39781 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedbmesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blenderplayer/bad_level_call_stubs/stubs.c