GP: Reorganize origin popover and top area

- Draw on back buttons moves near mode
- zDepth offset moved from View Panel to Popover
- Target for Stroke mode moved to popover
- New First point snap mode

3 files changed, 22 insertions, 10 deletions

diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 3499411f632..1ca3d9adc2b 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -357,7 +357,6 @@ class DATA_PT_gpencil_display(DataButtonsPanel, Panel):
 
         layout.prop(gpd, "use_force_fill_recalc", text="Force Fill Update")
         layout.prop(gpd, "use_adaptative_uv", text="Adaptative UVs")
-        layout.prop(gpd, "zdepth_offset", text="Surface Offset")
 
 
 class DATA_PT_gpencil_canvas(DataButtonsPanel, Panel):
diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index d5a3c2a542b..1f931529800 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -210,13 +210,6 @@ class TOPBAR_HT_lower_bar(Header):
                     panel="TOPBAR_PT_gpencil_layers",
                     text=text,
                 )
-                if tool_mode == 'GPENCIL_PAINT':
-                    tool_settings = context.tool_settings
-                    layout.prop(tool_settings, "use_gpencil_draw_onback", text="", icon='MOD_OPACITY')
-                    layout.prop(tool_settings, "use_gpencil_weight_data_add", text="", icon='WPAINT_HLT')
-                    layout.prop(tool_settings, "use_gpencil_additive_drawing", text="", icon='FREEZE')
-                    if tool_settings.gpencil_stroke_placement_view3d == 'STROKE':
-                        layout.prop(tool_settings, "use_gpencil_stroke_endpoints", text="", icon='CURVE_DATA')
         elif tool_space_type == 'IMAGE_EDITOR':
             if tool_mode == 'PAINT':
                 layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".imagepaint_2d", category="")
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 5188f565719..f18c49930e7 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -65,7 +65,12 @@ class VIEW3D_HT_header(Header):
             gpd = context.gpencil_data
 
             if gpd.is_stroke_paint_mode:
-                row = layout.row(align=True)
+                row = layout.row()
+                sub = row.row(align=True)
+                sub.prop(tool_settings, "use_gpencil_draw_onback", text="", icon='MOD_OPACITY')
+                sub.prop(tool_settings, "use_gpencil_weight_data_add", text="", icon='WPAINT_HLT')
+                sub.prop(tool_settings, "use_gpencil_additive_drawing", text="", icon='FREEZE')
+
                 row.popover(
                     panel="VIEW3D_PT_tools_grease_pencil_shapes",
                     text="Shapes"
@@ -4888,11 +4893,26 @@ class VIEW3D_PT_gpencil_origin(Panel):
 
     def draw(self, context):
         layout = self.layout
+        ts = context.tool_settings
+        gpd = context.gpencil_data
+
         layout.label(text="Stroke Placement")
 
         row = layout.row()
         col = row.column()
-        col.prop(context.tool_settings, "gpencil_stroke_placement_view3d", expand=True)
+        col.prop(ts, "gpencil_stroke_placement_view3d", expand=True)
+
+        if ts.gpencil_stroke_placement_view3d == 'SURFACE':
+            row = layout.row()
+            row.label(text="Offset")
+            row = layout.row()
+            row.prop(gpd, "zdepth_offset", text="")
+
+        if ts.gpencil_stroke_placement_view3d == 'STROKE':
+            row = layout.row()
+            row.label(text="Target")
+            row = layout.row()
+            row.prop(ts, "gpencil_stroke_snap_mode", expand=True)
 
 
 class VIEW3D_PT_gpencil_lock(Panel):