Merging r40366 through r40392 from trunk into soc-2011-garlic soc-2011-garlic
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 20 Sep 2011 12:01:16 +0000 (12:01 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 20 Sep 2011 12:01:16 +0000 (12:01 +0000)
1  2 
release/scripts/startup/bl_ui/properties_data_mesh.py
release/scripts/startup/bl_ui/properties_material.py
release/scripts/startup/bl_ui/space_info.py
release/scripts/startup/bl_ui/space_view3d.py
release/scripts/startup/bl_ui/space_view3d_toolbar.py
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/view2d.c
source/blender/editors/space_view3d/view3d_header.c

@@@ -34,7 -34,11 +34,11 @@@ class MESH_MT_vertex_group_specials(Men
          layout.operator("object.vertex_group_copy_to_linked", icon='LINK_AREA')
          layout.operator("object.vertex_group_copy_to_selected", icon='LINK_AREA')
          layout.operator("object.vertex_group_mirror", icon='ARROW_LEFTRIGHT')
 -        layout.operator("object.vertex_group_remove", icon='X', text="Delete All").all = True
 +        layout.operator("object.vertex_group_remove", icon='X', text=_("Delete All")).all = True
+         layout.separator()
+         layout.operator("object.vertex_group_lock", icon='LOCK', text="Lock All").action = 'SELECT'
+         layout.operator("object.vertex_group_lock", icon='UNLOCK', text="UnLock All").action = 'DESELECT'
+         layout.operator("object.vertex_group_lock", icon='LOCK', text="Lock Invert All").action = 'INVERT'
  
  
  class MESH_MT_shape_key_specials(Menu):
@@@ -603,18 -603,46 +603,46 @@@ class MATERIAL_PT_flare(MaterialButtons
          split = layout.split()
  
          col = split.column()
 -        col.prop(halo, "flare_size", text="Size")
 -        col.prop(halo, "flare_boost", text="Boost")
 -        col.prop(halo, "flare_seed", text="Seed")
 +        col.prop(halo, "flare_size", text=_("Size"))
 +        col.prop(halo, "flare_boost", text=_("Boost"))
 +        col.prop(halo, "flare_seed", text=_("Seed"))
  
          col = split.column()
 -        col.prop(halo, "flare_subflare_count", text="Subflares")
 -        col.prop(halo, "flare_subflare_size", text="Subsize")
 +        col.prop(halo, "flare_subflare_count", text=_("Subflares"))
 +        col.prop(halo, "flare_subflare_size", text=_("Subsize"))
  
  
- class MATERIAL_PT_physics(MaterialButtonsPanel, Panel):
+ class MATERIAL_PT_game_settings(MaterialButtonsPanel, bpy.types.Panel):
+     bl_label = "Game Settings"
+     COMPAT_ENGINES = {'BLENDER_GAME'}
+     @classmethod
+     def poll(cls, context):
+          return context.material and (context.scene.render.engine in cls.COMPAT_ENGINES)
+     def draw(self, context):
+         layout = self.layout
+         game = context.material.game_settings  # dont use node material
+         row = layout.row()
+         row.prop(game, "back_culling")
+         row.prop(game, "invisible")
+         row.prop(game, "text")
+         row = layout.row()
+         row.label(text="Alpha Blend:")
+         row.label(text="Face Orientation:")
+         row = layout.row()
+         row.prop(game,"alpha_blend",text="")
+         row.prop(game,"face_orientation",text="")
+ class MATERIAL_PT_physics(MaterialButtonsPanel, bpy.types.Panel):
      bl_label = "Physics"
      COMPAT_ENGINES = {'BLENDER_GAME'}
+       
+     def draw_header(self, context):
+         game = context.material.game_settings
+         self.layout.prop(game, "physics", text="")
  
      @classmethod
      def poll(cls, context):
@@@ -380,7 -379,8 +380,8 @@@ class INFO_MT_help(Menu)
          if sys.platform[:3] == "win":
              layout.operator("wm.console_toggle", icon='CONSOLE')
              layout.separator()
 -        layout.operator("anim.update_data_paths", text="FCurve/Driver Version fix", icon='HELP')
 +        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')
  
@@@ -1068,11 -1067,12 +1068,12 @@@ class VIEW3D_MT_paint_weight(Menu)
  
          layout.separator()
  
 -        layout.operator("object.vertex_group_normalize_all", text="Normalize All")
 -        layout.operator("object.vertex_group_normalize", text="Normalize")
 -        layout.operator("object.vertex_group_invert", text="Invert")
 -        layout.operator("object.vertex_group_clean", text="Clean")
 -        layout.operator("object.vertex_group_levels", text="Levels")
 +        layout.operator("object.vertex_group_normalize_all", text=_("Normalize All"))
 +        layout.operator("object.vertex_group_normalize", text=_("Normalize"))
 +        layout.operator("object.vertex_group_invert", text=_("Invert"))
 +        layout.operator("object.vertex_group_clean", text=_("Clean"))
 +        layout.operator("object.vertex_group_levels", text=_("Levels"))
+         layout.operator("object.vertex_group_fix", text="Fix Deforms")
  
          layout.separator()