svn merge ^/trunk/blender -r40498:40511
authorCampbell Barton <ideasman42@gmail.com>
Sat, 24 Sep 2011 11:03:52 +0000 (11:03 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 24 Sep 2011 11:03:52 +0000 (11:03 +0000)
commitdab7dba2db4513d7f0ea2e7b8eea8b28cd94fc3e
treeb9c042c3f9373d82f5084c2baa5d35a94986ef5d
parent2cc2e9b841aa4e4f565d20a8343cbb91f7003420
parenta043133bab034480f05eae16135560228e67fe30
svn merge ^/trunk/blender -r40498:40511
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editbmesh_add.c
source/blender/editors/space_view3d/drawmesh.c