[Bf-blender-cvs] [36188466daf] greasepencil-object: UI: Show falloff only in sculpt mode

[Antonio Vazquez]

Commit: 36188466daf1081c71d0ea96e79350548689e222
Author: Antonio Vazquez
Date:   Fri Dec 1 10:32:49 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB36188466daf1081c71d0ea96e79350548689e222

UI: Show falloff only in sculpt mode

Changed the icon and other minor changes.

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

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

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

diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 2d697ade86e..317e6afcd53 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -543,6 +543,7 @@ class GreasePencilMultiFramePanel:
         layout.enabled = gpd.use_multiedit
 
         col = layout.column(align=True)
+        col.prop(gpd, "show_multiedit_line_only", text="Display only edit lines")
         col.prop(settings, "use_multiframe_falloff")
 
         # Falloff curve
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 6168a41aa83..4288e0d9080 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -172,8 +172,10 @@ class VIEW3D_HT_header(Header):
                 settings = context.tool_settings.gpencil_sculpt
                 row = layout.row(align=True)
                 row.prop(gpd, "use_multiedit", text="Multi Frame", icon="FORCE_HARMONIC")
+                col = row.column()
+                col.enabled = gpd.is_stroke_sculpt_mode
+                col.prop(settings, "use_multiframe_falloff", text="", icon="SMOOTHCURVE")
                 row.prop(gpd, "show_multiedit_line_only", text="", icon="GHOST")
-                row.prop(settings, "use_multiframe_falloff", text="", icon="PROP_ON")
 
 
 class VIEW3D_MT_editor_menus(Menu):