diff options
Diffstat (limited to 'release')
5 files changed, 38 insertions, 48 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index b74c89bb67e..37c91370979 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -35,6 +35,10 @@ class MESH_MT_vertex_group_specials(Menu): 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.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): @@ -285,53 +289,6 @@ class DATA_PT_uv_texture(MeshButtonsPanel, Panel): layout.prop(lay, "name") -class DATA_PT_texface(MeshButtonsPanel, Panel): - bl_label = "Texture Face" - COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} - - @classmethod - def poll(cls, context): - obj = context.object - return (context.mode == 'EDIT_MESH') and obj and obj.type == 'MESH' - - def draw(self, context): - layout = self.layout - col = layout.column() - - me = context.mesh - - tf = me.faces.active_tface - - if tf: - if context.scene.render.engine != 'BLENDER_GAME': - col.label(text=_("Options only supported in Game Engine")) - - split = layout.split() - col = split.column() - - col.prop(tf, "use_image") - col.prop(tf, "use_light") - col.prop(tf, "hide") - col.prop(tf, "use_collision") - - col.prop(tf, "use_blend_shared") - col.prop(tf, "use_twoside") - col.prop(tf, "use_object_color") - - col = split.column() - - col.prop(tf, "use_halo") - col.prop(tf, "use_billboard") - col.prop(tf, "use_shadow_cast") - col.prop(tf, "use_bitmap_text") - col.prop(tf, "use_alpha_sort") - - col = layout.column() - col.prop(tf, "blend_type") - else: - col.label(text=_("No UV Texture")) - - class DATA_PT_vertex_colors(MeshButtonsPanel, Panel): bl_label = "Vertex Colors" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} diff --git a/release/scripts/startup/bl_ui/properties_material.py b/release/scripts/startup/bl_ui/properties_material.py index dda6610933d..7b04c990c6a 100644 --- a/release/scripts/startup/bl_ui/properties_material.py +++ b/release/scripts/startup/bl_ui/properties_material.py @@ -612,9 +612,37 @@ class MATERIAL_PT_flare(MaterialButtonsPanel, Panel): 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): @@ -622,6 +650,7 @@ class MATERIAL_PT_physics(MaterialButtonsPanel, Panel): def draw(self, context): layout = self.layout + layout.active = context.material.game_settings.physics phys = context.material.physics # dont use node material diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py index 99ee24406ac..3e6abaa8ea3 100644 --- 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') diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 69dd18d7a60..2e86e875bab 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1073,6 +1073,7 @@ class VIEW3D_MT_paint_weight(Menu): 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() diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 7ac2df7b5d5..6bd2168dab9 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -647,6 +647,7 @@ class VIEW3D_PT_tools_brush(PaintPanel, Panel): elif context.weight_paint_object and brush: layout.prop(context.tool_settings, "vertex_group_weight", text="Weight", slider=True) layout.prop(context.tool_settings, "use_auto_normalize", text="Auto Normalize") + layout.prop(context.tool_settings, "use_multipaint", text="Multi-Paint") col = layout.column() @@ -1059,6 +1060,7 @@ class VIEW3D_PT_tools_weightpaint(View3DPanel, Panel): col.operator("object.vertex_group_invert", text="Invert") col.operator("object.vertex_group_clean", text="Clean") col.operator("object.vertex_group_levels", text="Levels") + col.operator("object.vertex_group_fix", text="Fix Deforms") class VIEW3D_PT_tools_weightpaint_options(View3DPanel, Panel): |