[Bf-blender-cvs] [042298f6a33] greasepencil-object: Adjust UI to use new properties for falloff

[Antonio Vazquez]

Commit: 042298f6a3349d1362f70549ad7ac066601b21a4
Author: Antonio Vazquez
Date:   Thu Nov 30 20:11:10 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB042298f6a3349d1362f70549ad7ac066601b21a4

Adjust UI to use new properties for falloff

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

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 377736fa5cb..2fc4c0688eb 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -530,14 +530,20 @@ class GreasePencilMultiFramePanel:
     @staticmethod
     def draw(self, context):
         layout = self.layout
+        gpd = context.gpencil_data
         settings = context.tool_settings.gpencil_sculpt
 
         row = layout.row()
+        row.prop(gpd, "use_multiedit", text="Multi Frame", icon="FORCE_HARMONIC")
+
+        row = layout.row()
+        row.enabled = gpd.use_multiedit
         row.prop(settings, "use_multiframe_falloff")
 
         # Falloff curve
         layout.label("Falloff")
         box = layout.box()
+        box.enabled = gpd.use_multiedit and settings.use_multiframe_falloff
         box.template_curve_mapping(settings, "multiframe_falloff_curve", brush=True)
 
 
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index db0748d72d0..6168a41aa83 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -169,9 +169,11 @@ class VIEW3D_HT_header(Header):
                 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, "use_multiedit", text="Multi Frame", icon="FORCE_HARMONIC")
                 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):