Commit 56bce373 authored by Brecht Van Lommel's avatar Brecht Van Lommel

Python / Cleanup: rename INFO_MT to TOPBAR_MT to reflect actual location.

parent b4496a81
......@@ -3182,14 +3182,14 @@ def Dimension_button(self, context):
def register():
bpy.utils.register_module(__name__)
bpy.types.INFO_MT_curve_add.append(Dimension_button)
bpy.types.VIEW3D_MT_curve_add.append(Dimension_button)
DimensionVariables()
def unregister():
bpy.utils.unregister_module(__name__)
bpy.types.INFO_MT_curve_add.remove(Dimension_button)
bpy.types.VIEW3D_MT_curve_add.remove(Dimension_button)
if __name__ == "__main__":
register()
......@@ -62,13 +62,13 @@ classes = (
def register():
for cls in classes:
bpy.utils.register_class(cls)
bpy.types.INFO_MT_mesh_add.append(menu_func_castle)
bpy.types.VIEW3D_MT_mesh_add.append(menu_func_castle)
def unregister():
for cls in classes:
bpy.utils.unregister_class(cls)
bpy.types.INFO_MT_mesh_add.remove(menu_func_castle)
bpy.types.VIEW3D_MT_mesh_add.remove(menu_func_castle)
if __name__ == "__main__":
......
......@@ -513,11 +513,11 @@ def register():
bpy.utils.register_module(__name__)
bpy.types.Scene.atom_cluster = bpy.props.PointerProperty(type=
CLASS_atom_cluster_Properties)
bpy.types.INFO_MT_mesh_add.append(DEF_menu_func)
bpy.types.VIEW3D_MT_mesh_add.append(DEF_menu_func)
def unregister():
bpy.utils.unregister_module(__name__)
bpy.types.INFO_MT_mesh_add.remove(DEF_menu_func)
bpy.types.VIEW3D_MT_mesh_add.remove(DEF_menu_func)
if __name__ == "__main__":
......
......@@ -44,9 +44,9 @@ else:
import bpy
class INFO_MT_mesh_icy_add(bpy.types.Menu):
class VIEW3D_MT_mesh_icy_add(bpy.types.Menu):
# Define the "Ice" menu
bl_idname = "INFO_MT_mesh_ice_add"
bl_idname = "VIEW3D_MT_mesh_ice_add"
bl_label = "Ice & Snow"
def draw(self, context):
......@@ -62,21 +62,21 @@ class INFO_MT_mesh_icy_add(bpy.types.Menu):
# Define "Extras" menu
def menu_func(self, context):
self.layout.menu("INFO_MT_mesh_ice_add", text="Ice & Snow", icon="FREEZE")
self.layout.menu("VIEW3D_MT_mesh_ice_add", text="Ice & Snow", icon="FREEZE")
def register():
bpy.utils.register_module(__name__)
# Add "Extras" menu to the "Add Mesh" menu
bpy.types.INFO_MT_mesh_add.append(menu_func)
bpy.types.VIEW3D_MT_mesh_add.append(menu_func)
def unregister():
bpy.utils.unregister_module(__name__)
# Remove "Extras" menu from the "Add Mesh" menu.
bpy.types.INFO_MT_mesh_add.remove(menu_func)
bpy.types.VIEW3D_MT_mesh_add.remove(menu_func)
if __name__ == "__main__":
......
......@@ -391,12 +391,12 @@ def menu_func(self, context):
def register():
bpy.utils.register_class(IcicleGenerator)
bpy.types.INFO_MT_mesh_add.append(menu_func)
bpy.types.VIEW3D_MT_mesh_add.append(menu_func)
def unregister():
bpy.utils.unregister_class(IcicleGenerator)
bpy.types.INFO_MT_mesh_add.remove(menu_func)
bpy.types.VIEW3D_MT_mesh_add.remove(menu_func)
if __name__ == "__main__":
......
......@@ -585,14 +585,14 @@ def register():
bpy.utils.register_class(SnowflakeGen)
bpy.utils.register_class(MESH_MT_snowflakes_presets)
bpy.utils.register_class(SnowflakeGen_presets)
bpy.types.INFO_MT_mesh_add.append(menu_func)
bpy.types.VIEW3D_MT_mesh_add.append(menu_func)
def unregister():
bpy.utils.unregister_class(SnowflakeGen)
bpy.utils.unregister_class(MESH_MT_snowflakes_presets)
bpy.utils.unregister_class(SnowflakeGen_presets)
bpy.types.INFO_MT_mesh_add.remove(menu_func)
bpy.types.VIEW3D_MT_mesh_add.remove(menu_func)
if __name__ == "__main__":
......
......@@ -64,13 +64,13 @@ def menu_func_rocks(self, context):
def register():
bpy.utils.register_module(__name__)
bpy.types.INFO_MT_mesh_add.append(menu_func_rocks)
bpy.types.VIEW3D_MT_mesh_add.append(menu_func_rocks)
def unregister():
bpy.utils.unregister_module(__name__)
bpy.types.INFO_MT_mesh_add.remove(menu_func_rocks)
bpy.types.VIEW3D_MT_mesh_add.remove(menu_func_rocks)
if __name__ == "__main__":
......
......@@ -1110,11 +1110,11 @@ def menu_func(self, context):
def register():
bpy.utils.register_module(__name__)
bpy.types.INFO_MT_mesh_add.append(menu_func)
bpy.types.VIEW3D_MT_mesh_add.append(menu_func)
def unregister():
bpy.types.INFO_MT_mesh_add.remove(menu_func)
bpy.types.VIEW3D_MT_mesh_add.remove(menu_func)
bpy.utils.unregister_module(__name__)
......
......@@ -186,9 +186,9 @@ def ui_menu_lamps_add(self, context):
def register():
bpy.utils.register_class(AMTH_OBJECT_OT_meshlight_add)
bpy.types.INFO_MT_mesh_add.append(ui_menu_lamps_add)
bpy.types.VIEW3D_MT_mesh_add.append(ui_menu_lamps_add)
def unregister():
bpy.utils.unregister_class(AMTH_OBJECT_OT_meshlight_add)
bpy.types.INFO_MT_mesh_add.remove(ui_menu_lamps_add)
bpy.types.VIEW3D_MT_mesh_add.remove(ui_menu_lamps_add)
......@@ -61,7 +61,7 @@ def button_save_reload(self, context):
def register():
bpy.utils.register_class(AMTH_WM_OT_save_reload)
bpy.types.INFO_MT_file.append(button_save_reload)
bpy.types.TOPBAR_MT_file.append(button_save_reload)
wm = bpy.context.window_manager
kc = wm.keyconfigs.addon
km = kc.keymaps.new(name="Window")
......@@ -72,7 +72,7 @@ def register():
def unregister():
bpy.utils.unregister_class(AMTH_WM_OT_save_reload)
bpy.types.INFO_MT_file.remove(button_save_reload)
bpy.types.TOPBAR_MT_file.remove(button_save_reload)
for km, kmi in KEYMAPS:
km.keymap_items.remove(kmi)
KEYMAPS.clear()
......@@ -46,14 +46,14 @@ operator and the AdjustableOperatorFromTexture operator. """
bpy.utils.register_class(AutoOp.AutomatOperatorFromTexture)
bpy.utils.register_class(AdjOp.AdjustableOperatorFromTexture)
bpy.types.INFO_MT_file_import.append(menu_draw)
bpy.types.TOPBAR_MT_file_import.append(menu_draw)
def unregister():
"""This method unregisters the AutomatOperatorFromTexture
operator and the AdjustableOperatorFromTexture operator. """
bpy.types.INFO_MT_file_import.remove(menu_draw)
bpy.types.TOPBAR_MT_file_import.remove(menu_draw)
bpy.utils.unregister_class(AutoOp.AutomatOperatorFromTexture)
bpy.utils.unregister_class(AdjOp.AdjustableOperatorFromTexture)
......
......@@ -281,15 +281,15 @@ def menu_func_import(self, context):
def register():
bpy.utils.register_module(__name__)
bpy.types.INFO_MT_file_import.append(menu_func_import)
#bpy.types.INFO_MT_file_export.append(menu_func_export)
bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
#bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
def unregister():
bpy.utils.unregister_module(__name__)
bpy.types.INFO_MT_file_import.remove(menu_func_import)
#bpy.types.INFO_MT_file_export.remove(menu_func_export)
bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
#bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
if __name__ == "__main__":
register()
\ No newline at end of file
......@@ -1460,13 +1460,13 @@ def menu_func(self, context):
def register():
bpy.utils.register_module(__name__)
bpy.types.INFO_MT_file_export.append(menu_func)
bpy.types.TOPBAR_MT_file_export.append(menu_func)
def unregister():
bpy.utils.unregister_module(__name__)
bpy.types.INFO_MT_file_export.remove(menu_func)
bpy.types.TOPBAR_MT_file_export.remove(menu_func)
if __name__ == "__main__":
......
......@@ -683,10 +683,10 @@ def menu_func(self, context):
self.layout.operator(ExportMD3.bl_idname, text="Quake Model 3 (.md3)").filepath = newpath
def register():
bpy.types.INFO_MT_file_export.append(menu_func)
bpy.types.TOPBAR_MT_file_export.append(menu_func)
def unregister():
bpy.types.INFO_MT_file_export.remove(menu_func)
bpy.types.TOPBAR_MT_file_export.remove(menu_func)
if __name__ == "__main__":
register()
......@@ -161,11 +161,11 @@ class Brush_set_UI(bpy.types.Panel):
def register():
bpy.utils.register_module(__name__)
bpy.types.INFO_MT_file_import.append(menu_func)
bpy.types.TOPBAR_MT_file_import.append(menu_func)
def unregister():
bpy.utils.unregister_module(__name__)
bpy.types.INFO_MT_file_import.remove(menu_func)
bpy.types.TOPBAR_MT_file_import.remove(menu_func)
if __name__ == "__main__":
register()
......@@ -1906,7 +1906,7 @@ class ModalTimerOperator(bpy.types.Operator):
def register():
bpy.utils.register_module(__name__)
bpy.types.Scene.imp_sound_to_anim = PointerProperty(type=ImpSoundtoAnim, name="Import: Sound to Animation", description="Extract movement from sound file. See the Object Panel at the end.")
bpy.types.INFO_MT_file_import.append(WavFileImport)
bpy.types.TOPBAR_MT_file_import.append(WavFileImport)
def unregister():
......@@ -1916,7 +1916,7 @@ def unregister():
pass
try:
bpy.types.INFO_MT_file_import.remove(WavFileImport)
bpy.types.TOPBAR_MT_file_import.remove(WavFileImport)
except:
pass
......
......@@ -318,12 +318,12 @@ def menu_func(self, context):
def register():
bpy.utils.register_module(__name__)
bpy.types.INFO_MT_file_import.append(menu_func)
bpy.types.TOPBAR_MT_file_import.append(menu_func)
def unregister():
bpy.utils.unregister_module(__name__)
bpy.types.INFO_MT_file_import.remove(menu_func)
bpy.types.TOPBAR_MT_file_import.remove(menu_func)
if __name__ == "__main__":
......
......@@ -172,11 +172,11 @@ def menu_func_import(self, context):
def register():
bpy.utils.register_module(__name__)
bpy.types.INFO_MT_file_import.append(menu_func_import)
bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
def unregister():
bpy.utils.unregister_module(__name__)
bpy.types.INFO_MT_file_import.remove(menu_func_import)
bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
if __name__ == "__main__":
......
......@@ -236,13 +236,13 @@ def menu_func_export(self, context):
def register():
bpy.utils.register_module(__name__)
bpy.types.INFO_MT_file_import.append(menu_func)
bpy.types.INFO_MT_file_export.append(menu_func_export)
bpy.types.TOPBAR_MT_file_import.append(menu_func)
bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
def unregister():
bpy.utils.unregister_module(__name__)
bpy.types.INFO_MT_file_import.remove(menu_func)
bpy.types.INFO_MT_file_export.remove(menu_func_export)
bpy.types.TOPBAR_MT_file_import.remove(menu_func)
bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
if __name__ == "__main__":
......
......@@ -114,15 +114,15 @@ def menu_func_export(self, context):
def register():
bpy.utils.register_module(__name__)
bpy.types.INFO_MT_file_import.append(menu_func_import)
bpy.types.INFO_MT_file_export.append(menu_func_export)
bpy.types.TOPBAR_MT_file_import.append(menu_func_import)
bpy.types.TOPBAR_MT_file_export.append(menu_func_export)
def unregister():
bpy.utils.unregister_module(__name__)
bpy.types.INFO_MT_file_import.remove(menu_func_import)
bpy.types.INFO_MT_file_export.remove(menu_func_export)
bpy.types.TOPBAR_MT_file_import.remove(menu_func_import)
bpy.types.TOPBAR_MT_file_export.remove(menu_func_export)
if __name__ == "__main__":
......
......@@ -459,18 +459,18 @@ def menu_func_xanim_export(self, context):
def register():
bpy.utils.register_module(__name__)
bpy.types.INFO_MT_file_import.append(menu_func_xmodel_import)
#bpy.types.INFO_MT_file_import.append(menu_func_xanim_import)
bpy.types.INFO_MT_file_export.append(menu_func_xmodel_export)
bpy.types.INFO_MT_file_export.append(menu_func_xanim_export)
bpy.types.TOPBAR_MT_file_import.append(menu_func_xmodel_import)
#bpy.types.TOPBAR_MT_file_import.append(menu_func_xanim_import)
bpy.types.TOPBAR_MT_file_export.append(menu_func_xmodel_export)
bpy.types.TOPBAR_MT_file_export.append(menu_func_xanim_export)
def unregister():
bpy.utils.unregister_module(__name__)
bpy.types.INFO_MT_file_import.remove(menu_func_xmodel_import)
#bpy.types.INFO_MT_file_import.remove(menu_func_xanim_import)
bpy.types.INFO_MT_file_export.remove(menu_func_xmodel_export)
bpy.types.INFO_MT_file_export.remove(menu_func_xanim_export)
bpy.types.TOPBAR_MT_file_import.remove(menu_func_xmodel_import)
#bpy.types.TOPBAR_MT_file_import.remove(menu_func_xanim_import)
bpy.types.TOPBAR_MT_file_export.remove(menu_func_xmodel_export)
bpy.types.TOPBAR_MT_file_export.remove(menu_func_xanim_export)
if __name__ == "__main__":
register()
......@@ -110,8 +110,8 @@ from bpy.utils import (
unregister_module,
)
from bpy.types import (
INFO_MT_file_export,
INFO_MT_file_import,
TOPBAR_MT_file_export,
TOPBAR_MT_file_import,
)
......@@ -128,18 +128,18 @@ def register():
fpx_ui.register()
register_module(__name__)
INFO_MT_file_import.append(FpmImportOperator.menu_func)
INFO_MT_file_import.append(FplImportOperator.menu_func)
INFO_MT_file_import.append(FptImportOperator.menu_func)
TOPBAR_MT_file_import.append(FpmImportOperator.menu_func)
TOPBAR_MT_file_import.append(FplImportOperator.menu_func)
TOPBAR_MT_file_import.append(FptImportOperator.menu_func)
def unregister():
fpx_ui.unregister()
unregister_module(__name__)
INFO_MT_file_import.remove(FpmImportOperator.menu_func)
INFO_MT_file_import.remove(FplImportOperator.menu_func)
INFO_MT_file_import.remove(FptImportOperator.menu_func)
TOPBAR_MT_file_import.remove(FpmImportOperator.menu_func)
TOPBAR_MT_file_import.remove(FplImportOperator.menu_func)
TOPBAR_MT_file_import.remove(FptImportOperator.menu_func)
###############################################################################
......
......@@ -116,13 +116,13 @@ def menu_func(self, context):
def register():
bpy.utils.register_module(__name__)
bpy.types.INFO_MT_file_export.append(menu_func)
bpy.types.TOPBAR_MT_file_export.append(menu_func)
def unregister():
bpy.utils.unregister_module(__name__)
bpy.types.INFO_MT_file_export.remove(menu_func)
bpy.types.TOPBAR_MT_file_export.remove(menu_func)
if __name__ == "__main__":
register()
......@@ -351,9 +351,9 @@ def menu_func_export(self, context):
def register():
bpy.utils.register_class(ImportOSM)
bpy.types.INFO_MT_file_import.append(menu_func_export)
bpy.types.TOPBAR_MT_file_import.append(menu_func_export)
def unregister():
bpy.utils.unregister_class(ImportOSM)
bpy.types.INFO_MT_file_import.remove(menu_func_export)
bpy.types.TOPBAR_MT_file_import.remove(menu_func_export)
......@@ -236,13 +236,13 @@ def menu_import(self, context):
def register():
bpy.utils.register_module(__name__)
bpy.types.INFO_MT_file_import.append(menu_import)
bpy.types.TOPBAR_MT_file_import.append(menu_import)
def unregister():
bpy.utils.unregister_module(__name__)
bpy.types.INFO_MT_file_import.remove(menu_import)
bpy.types.TOPBAR_MT_file_import.remove(menu_import)
if __name__ == "__main__":
......
......@@ -340,12 +340,12 @@ def do_creaprim(self, mesh, objname, addondir):
strlist.append("\n")
strlist.append("def register():\n")
strlist.append(" bpy.utils.register_module(__name__)\n")
strlist.append(" bpy.types.INFO_MT_mesh_add.append(menu_item)\n")
strlist.append(" bpy.types.VIEW3D_MT_mesh_add.append(menu_item)\n")
strlist.append("\n")
strlist.append("\n")
strlist.append("def unregister():\n")
strlist.append(" bpy.utils.unregister_module(__name__)\n")
strlist.append(" bpy.types.INFO_MT_mesh_add.remove(menu_item)\n")
strlist.append(" bpy.types.VIEW3D_MT_mesh_add.remove(menu_item)\n")
strlist.append("\n")
strlist.append("\n")
strlist.append("if __name__ == \"__main__\":\n")
......@@ -410,8 +410,8 @@ def makeinit(txtlist, namelist, groupname, addondir):
strlist.append("import bpy\n")
strlist.append("\n")
strlist.append("\n")
strlist.append("class INFO_MT_mesh_" + str.lower(groupname) + "_add(bpy.types.Menu):\n")
strlist.append(" bl_idname = \"INFO_MT_mesh_" + str.lower(groupname) + "_add\"\n")
strlist.append("class VIEW3D_MT_mesh_" + str.lower(groupname) + "_add(bpy.types.Menu):\n")
strlist.append(" bl_idname = \"VIEW3D_MT_mesh_" + str.lower(groupname) + "_add\"\n")
strlist.append(" bl_label = \"" + groupname + "\"\n")
strlist.append("\n")
strlist.append(" def draw(self, context):\n")
......@@ -422,17 +422,17 @@ def makeinit(txtlist, namelist, groupname, addondir):
strlist.append("\n")
strlist.append("\n")
strlist.append("def menu_item(self, context):\n")
strlist.append(" self.layout.menu(\"INFO_MT_mesh_" + str.lower(groupname) + "_add\", icon=\"PLUGIN\")\n")
strlist.append(" self.layout.menu(\"VIEW3D_MT_mesh_" + str.lower(groupname) + "_add\", icon=\"PLUGIN\")\n")
strlist.append("\n")
strlist.append("\n")
strlist.append("def register():\n")
strlist.append(" bpy.utils.register_module(__name__)\n")
strlist.append(" bpy.types.INFO_MT_mesh_add.append(menu_item)\n")
strlist.append(" bpy.types.VIEW3D_MT_mesh_add.append(menu_item)\n")
strlist.append("\n")
strlist.append("\n")
strlist.append("def unregister():\n")
strlist.append(" bpy.utils.unregister_module(__name__)\n")
strlist.append(" bpy.types.INFO_MT_mesh_add.remove(menu_item)\n")
strlist.append(" bpy.types.VIEW3D_MT_mesh_add.remove(menu_item)\n")
strlist.append("\n")
strlist.append("\n")
strlist.append("if __name__ == \"__main__\":\n")
......
......@@ -87,12 +87,12 @@ def add_screw_list(self, context):
icon="PLUGIN")
def register():
bpy.types.INFO_MT_mesh_add.append(add_screw_list)
bpy.types.VIEW3D_MT_mesh_add.append(add_screw_list)
bpy.utils.register_class(oscMakeScrew)
def unregister():
bpy.types.INFO_MT_mesh_add.remove(add_screw_list)
bpy.types.VIEW3D_MT_mesh_add.remove(add_screw_list)
bpy.utils.unregister_class(oscMakeScrew)
......
......@@ -161,7 +161,7 @@ class SyncAllSubsurfRenderLevels(bpy.types.Operator):
class RenderResolutionPercentageMenu(bpy.types.Menu):
bl_idname = "INFO_MT_render_resolution_percentage"
bl_idname = "TOPBAR_MT_render_resolution_percentage"
bl_label = "Rendering size (%)"
bl_description = "Setting is set to either rendered in what percent of the size of the resolution"
......@@ -189,7 +189,7 @@ class RenderResolutionPercentageMenu(bpy.types.Menu):
class SimplifyRenderMenu(bpy.types.Menu):
bl_idname = "INFO_MT_render_simplify"
bl_idname = "TOPBAR_MT_render_simplify"
bl_label = "Simplify Render"
bl_description = "I simplified set of rendering"
......@@ -204,7 +204,7 @@ class SimplifyRenderMenu(bpy.types.Menu):
class ShadeingMenu(bpy.types.Menu):
bl_idname = "INFO_MT_render_shadeing"
bl_idname = "TOPBAR_MT_render_shadeing"
bl_label = "Use shading"
bl_description = "Shading on / off"
......@@ -217,7 +217,7 @@ class ShadeingMenu(bpy.types.Menu):
class SubsurfMenu(bpy.types.Menu):
bl_idname = "INFO_MT_render_subsurf"
bl_idname = "TOPBAR_MT_render_subsurf"
bl_label = "Subsurf Level All"
bl_description = "Subsurf subdivision level of all objects"
......@@ -330,7 +330,7 @@ def menu(self, context):
class AnimateRenderMenu(bpy.types.Menu):
bl_idname = "INFO_MT_render_animate_menu"
bl_idname = "TOPBAR_MT_render_animate_menu"
bl_label = "Animation"
bl_description = "Set Frames & Animation Length"
......@@ -424,12 +424,12 @@ class RenderSettingsPanel(bpy.types.Panel):
def register():
bpy.utils.register_module(__name__)
bpy.types.INFO_MT_render.append(menu)
bpy.types.TOPBAR_MT_render.append(menu)
# unregister
def unregister():
bpy.types.INFO_MT_render.remove(menu)
bpy.types.TOPBAR_MT_render.remove(menu)
bpy.utils.unregister_module(__name__)
if __name__ == "__main__":
......
......@@ -120,7 +120,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
layout.menu("VIEW3D_MT_Select_Edit_Mesh2", icon='RESTRICT_SELECT_OFF')
layout.menu("VIEW3D_MT_Edit_Multi2", icon='VERTEXSEL')
UseSeparator(self, context)
layout.menu("INFO_MT_mesh_add", text="Add Mesh", icon='OUTLINER_OB_MESH')
layout.menu("VIEW3D_MT_mesh_add", text="Add Mesh", icon='OUTLINER_OB_MESH')
layout.menu("VIEW3D_MT_Edit_Mesh2", text="Mesh", icon='MESH_DATA')
UseSeparator(self, context)
layout.menu("VIEW3D_MT_TransformMenuEdit2", icon='MANIPUL')
......@@ -257,7 +257,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
layout.menu("VIEW3D_MT_Select_Edit_Curve2",
icon='RESTRICT_SELECT_OFF')
UseSeparator(self, context)
layout.menu("INFO_MT_curve_add", text="Add Curve",
layout.menu("VIEW3D_MT_curve_add", text="Add Curve",
icon='OUTLINER_OB_CURVE')
layout.menu("VIEW3D_MT_Edit_Curve2", icon='CURVE_DATA')
UseSeparator(self, context)
......@@ -318,7 +318,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
layout.menu("VIEW3D_MT_View_Menu2", icon='ZOOM_ALL')
layout.menu("VIEW3D_MT_Select_Edit_Surface2", icon='RESTRICT_SELECT_OFF')
UseSeparator(self, context)
layout.menu("INFO_MT_surface_add", text="Add Surface",
layout.menu("VIEW3D_MT_surface_add", text="Add Surface",
icon='OUTLINER_OB_SURFACE')
layout.menu("VIEW3D_MT_TransformMenu2", icon='MANIPUL')
layout.menu("VIEW3D_MT_MirrorMenu2", icon='MOD_MIRROR')
......@@ -553,7 +553,7 @@ class VIEW3D_PT_Toolshelf_menu(View3DPanel, Panel):
layout.menu("VIEW3D_MT_Select_Edit_Armature2",
icon='RESTRICT_SELECT_OFF')
UseSeparator(self, context)
layout.menu("INFO_MT_armature_add", text="Add Armature",
layout.menu("VIEW3D_MT_armature_add", text="Add Armature",
icon='OUTLINER_OB_ARMATURE')
layout.menu("VIEW3D_MT_Edit_Armature2", text="Armature",
icon='OUTLINER_DATA_ARMATURE')
......@@ -809,18 +809,18 @@ class VIEW3D_MT_AddMenu2(Menu):
layout = self.layout
layout.operator_context = 'INVOKE_REGION_WIN'
layout.menu("INFO_MT_mesh_add", text=