Merged changes in the trunk up to revision 45308.

Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
This commit is contained in:
Tamito Kajiyama
2012-03-31 22:09:43 +00:00
494 changed files with 47297 additions and 45552 deletions

View File

@@ -343,7 +343,8 @@ MODULE_GROUPING = {
"BMLayerCollection",
"BMLayerItem",
("Custom-Data Layer Types", '-'),
"BMLoopUV"
"BMLoopUV",
"BMDeformVert"
)
}