Merge branch 'master' into blender2.8

2017-03-13 07:51:10 +11:00
parent 6d3d2b15cb e8021f5e3b
commit 4dacda58f9
24 changed files with 245 additions and 198 deletions
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1522,6 +1522,7 @@ class VIEW3D_MT_object_apply(Menu):
        layout.separator()

        layout.operator("object.visual_transform_apply", text="Visual Transform", text_ctxt=i18n_contexts.default)
+        layout.operator("object.convert", text="Visual Geometry to Mesh", text_ctxt=i18n_contexts.default).target = 'MESH'
        layout.operator("object.duplicates_make_real")