Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton
2017-10-19 17:05:38 +11:00

View File

@@ -1178,11 +1178,7 @@ class VIEW3D_MT_angle_control(Menu):
layout.prop(tex_slot, "use_random", text="Random")
# ********** Add menu **********
# XXX: INFO_MT_ names used to keep backwards compatibility (Add-ons etc. that hook into the menu)
class INFO_MT_mesh_add(Menu):
bl_idname = "INFO_MT_mesh_add"
bl_label = "Mesh"
@@ -1830,7 +1826,6 @@ class VIEW3D_MT_object_game(Menu):
layout.operator("object.game_property_clear")
# ********** Brush menu **********
class VIEW3D_MT_brush(Menu):
bl_label = "Brush"
@@ -1901,7 +1896,6 @@ class VIEW3D_MT_brush_paint_modes(Menu):
layout.prop(brush, "use_paint_image", text="Texture Paint")
# ********** Vertex paint menu **********
class VIEW3D_MT_paint_vertex(Menu):
bl_label = "Paint"
@@ -1977,8 +1971,6 @@ class VIEW3D_MT_vertex_group(Menu):
layout.operator("object.vertex_group_remove", text="Remove All Groups").all = True
# ********** Weight paint menu **********
class VIEW3D_MT_paint_weight(Menu):
bl_label = "Weights"
@@ -2021,9 +2013,6 @@ class VIEW3D_MT_paint_weight(Menu):
layout.operator("paint.weight_set")
# ********** Sculpt menu **********
class VIEW3D_MT_sculpt(Menu):
bl_label = "Sculpt"
@@ -2095,9 +2084,6 @@ class VIEW3D_MT_hide_mask(Menu):
props = layout.operator("paint.mask_lasso_gesture", text="Lasso Mask")
# ********** Particle menu **********
class VIEW3D_MT_particle(Menu):
bl_label = "Particle"
@@ -2185,9 +2171,6 @@ class VIEW3D_MT_particle_showhide(ShowHideMenu, Menu):
_operator_name = "particle"
# ********** Pose Menu **********
class VIEW3D_MT_pose(Menu):
bl_label = "Pose"