diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-09-29 12:55:00 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-09-29 12:55:00 +0300 |
| commit | e3fe8128e41bb7c576f02ba234dfabf5c399cb60 (patch) | |
| tree | cd148a38fb32cdb1a36fc576b9f36fe864003e40 /release/scripts/startup/bl_ui/space_view3d.py | |
| parent | 31be6fccf83095f4245f97730ccc7e61e51cfcec (diff) | |
| parent | 5a1954a5cbd7b0b1458fdc80ada5acd036278309 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/space_view3d.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index dfa2f3f17bb..a31fd81efb5 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -55,7 +55,7 @@ class VIEW3D_HT_header(Header): # Occlude geometry if ((view.viewport_shade not in {'BOUNDBOX', 'WIREFRAME'} and (mode == 'PARTICLE_EDIT' or (mode == 'EDIT' and obj.type == 'MESH'))) or - (mode == 'WEIGHT_PAINT')): + (mode in {'WEIGHT_PAINT', 'VERTEX_PAINT'})): row.prop(view, "use_occlude_geometry", text="") # Proportional editing @@ -170,7 +170,7 @@ class VIEW3D_MT_editor_menus(Menu): mesh = obj.data if mesh.use_paint_mask: layout.menu("VIEW3D_MT_select_paint_mask") - elif mesh.use_paint_mask_vertex and mode_string == 'PAINT_WEIGHT': + elif mesh.use_paint_mask_vertex and mode_string in {'PAINT_WEIGHT', 'PAINT_VERTEX'}: layout.menu("VIEW3D_MT_select_paint_mask_vertex") elif mode_string != 'SCULPT': layout.menu("VIEW3D_MT_select_%s" % mode_string.lower()) @@ -1778,6 +1778,7 @@ class VIEW3D_MT_paint_vertex(Menu): layout.operator("paint.vertex_color_set") layout.operator("paint.vertex_color_smooth") layout.operator("paint.vertex_color_dirt") + layout.operator("paint.vertex_color_from_weight") layout.separator() |