Merging r40366 through r40392 from trunk into soc-2011-garlic

2011-09-20 12:01:16 +00:00
parent 2015eefef7 78d4260144
commit 7172316b94
120 changed files with 3303 additions and 761 deletions
--- a/release/scripts/startup/bl_ui/space_info.py
+++ b/release/scripts/startup/bl_ui/space_info.py
@@ -381,6 +381,7 @@ class INFO_MT_help(Menu):
            layout.operator("wm.console_toggle", icon='CONSOLE')
            layout.separator()
        layout.operator("anim.update_data_paths", text=_("FCurve/Driver Version fix"), icon='HELP')
+        layout.operator("logic.texface_convert", text="TexFace to Material Convert", icon='GAME')
        layout.separator()
        layout.operator("wm.splash", icon='BLENDER')