[Bf-blender-cvs] [3536a2aac43] greasepencil-edit-curve: Merge branch 'master' into greasepencil-edit-curve

[Antonio Vazquez]

Commit: 3536a2aac43d705d6efc53936f194563031343e4
Author: Antonio Vazquez
Date:   Thu Jun 18 20:35:31 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB3536a2aac43d705d6efc53936f194563031343e4

Merge branch 'master' into greasepencil-edit-curve

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 20fa0b9165b,6cd1bc27fc0..0b1dfe7dc83
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -6801,15 -6785,12 +6801,18 @@@ class VIEW3D_PT_overlay_gpencil_options
  
              layout.prop(overlay, "vertex_opacity", text="Vertex Opacity", slider=True)
  
 +            # Handles for Curve Edit
 +            if context.object.mode == 'EDIT_GPENCIL':
 +                gpd = context.object.data
 +                if gpd.use_curve_edit:
 +                    layout.prop(overlay, "display_handle", text="Handles")
 +
          if context.object.mode in {'PAINT_GPENCIL', 'VERTEX_GPENCIL'}:
              layout.label(text="Vertex Paint")
-             layout.prop(overlay, "gpencil_vertex_paint_opacity", text="Opacity", slider=True)
+             row = layout.row()
+             shading = VIEW3D_PT_shading.get_shading(context)
+             row.enabled = shading.type not in {'WIREFRAME', 'RENDERED'}
+             row.prop(overlay, "gpencil_vertex_paint_opacity", text="Opacity", slider=True)
  
  
  class VIEW3D_PT_quad_view(Panel):