[Bf-blender-cvs] [bd7ccd4e959] greasepencil-object: UI: Remove redundanrt options moved to Top Bar

Antonio Vazquez noreply at git.blender.org
Thu May 31 16:11:46 CEST 2018


Commit: bd7ccd4e959268cf514495306969e131ab705c9c
Author: Antonio Vazquez
Date:   Thu May 31 16:11:33 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBbd7ccd4e959268cf514495306969e131ab705c9c

UI: Remove redundanrt options moved to Top Bar

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_topbar.py b/release/scripts/startup/bl_ui/space_topbar.py
index 1ff01045873..fa0e477ff03 100644
--- a/release/scripts/startup/bl_ui/space_topbar.py
+++ b/release/scripts/startup/bl_ui/space_topbar.py
@@ -109,6 +109,7 @@ class TOPBAR_HT_lower_bar(Header):
                     gpd.is_stroke_sculpt_mode or
                     gpd.is_stroke_weight_mode):
             row = layout.row(align=True)
+            row.prop(gpd, "show_edit_lines", text="", icon="PARTICLE_POINT")
             row.prop(gpd, "use_multiedit", text="", icon="FORCE_HARMONIC")
 
             sub = row.row(align=True)
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index be956c150ea..a3d30362111 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -127,18 +127,6 @@ class VIEW3D_HT_header(Header):
                 row.prop(context.tool_settings.gpencil_sculpt, "use_select_mask")
                 row.prop(context.tool_settings.gpencil_sculpt, "selection_alpha", slider=True)
 
-            if gpd.use_stroke_edit_mode or gpd.is_stroke_sculpt_mode or gpd.is_stroke_weight_mode:
-                settings = context.tool_settings.gpencil_sculpt
-                row = layout.row(align=True)
-                row.prop(gpd, "show_edit_lines", text="", icon="PARTICLE_POINT")
-                row.prop(gpd, "use_multiedit", text="Multi Frame", icon="FORCE_HARMONIC")
-                col = row.column()
-                col.enabled = gpd.use_multiedit and (gpd.is_stroke_sculpt_mode or gpd.use_stroke_edit_mode)
-                col.prop(settings, "use_multiframe_falloff", text="", icon="SMOOTHCURVE")
-                col = row.column()
-                col.enabled = gpd.use_multiedit
-                col.prop(gpd, "show_multiedit_line_only", text="", icon="GHOST")
-
             if gpd.is_stroke_paint_mode:
                 row = layout.row(align=True)
                 row.operator("gpencil.colorpick", text="Colors", icon="GROUP_VCOL")



More information about the Bf-blender-cvs mailing list