[Bf-blender-cvs] [5417c395640] greasepencil-object: UI: Move Shapes panel to Header

Antonio Vazquez noreply at git.blender.org
Wed Jul 25 13:20:53 CEST 2018


Commit: 5417c395640bd2223390e8399beac66f9bd1b380
Author: Antonio Vazquez
Date:   Wed Jul 25 13:20:44 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB5417c395640bd2223390e8399beac66f9bd1b380

UI: Move Shapes panel to Header

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

M	release/scripts/startup/bl_ui/space_view3d.py
M	release/scripts/startup/bl_ui/space_view3d_toolbar.py

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index db7e626acc4..cda948943d8 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -81,6 +81,13 @@ class VIEW3D_HT_header(Header):
         if obj and obj.type == 'GPENCIL' and context.gpencil_data:
             gpd = context.gpencil_data
 
+            if gpd.is_stroke_paint_mode:
+                row = layout.row(align=True)
+                row.popover(
+                    panel="VIEW3D_PT_tools_grease_pencil_shapes",
+                    text="Shapes"
+                )
+
             if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode or gpd.is_stroke_weight_mode:
                 row = layout.row(align=True)
                 row.prop(gpd, "use_multiedit", text="", icon="FORCE_HARMONIC")
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 366edb9cee1..cc2e1d659e5 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1587,10 +1587,9 @@ class VIEW3D_PT_tools_grease_pencil_brushcurves(View3DPanel, Panel):
 
 
 # Grease Pencil create shapes
-class VIEW3D_PT_tools_grease_pencil_shapes(Panel):
+class VIEW3D_PT_tools_grease_pencil_shapes(View3DPanel, Panel):
     bl_space_type = 'VIEW_3D'
-    bl_category = "Create"
-    bl_region_type = 'TOOLS'
+    bl_region_type = 'HEADER'
     bl_label = "Shapes"
 
     @classmethod
@@ -1777,8 +1776,7 @@ classes = (
     VIEW3D_PT_tools_grease_pencil_brush_stabilizer,
     VIEW3D_PT_tools_grease_pencil_brush_random,
     VIEW3D_PT_tools_grease_pencil_brushcurves,
-    # GPXX: review
-    # VIEW3D_PT_tools_grease_pencil_shapes,
+    VIEW3D_PT_tools_grease_pencil_shapes,
     VIEW3D_PT_tools_grease_pencil_sculpt,
     VIEW3D_PT_tools_grease_pencil_weight_paint,
     VIEW3D_PT_tools_grease_pencil_weight_tools,



More information about the Bf-blender-cvs mailing list