svn merge ^/trunk/blender -r40372:40379
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 06:18:03 +0000 (06:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 06:18:03 +0000 (06:18 +0000)
commit40e212149c82364124ec1aece07ab46915bc43c2
treefbb5f441c27f904f815b77135d29308d0db8c90f
parenta13f94865aa145be235eb28c411fdcc91982172e
parentc61ab5f5d1e8aa042c49bbc3653c3509559f7ac3
svn merge ^/trunk/blender -r40372:40379
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/armature/editarmature.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/view3d_select.c