[Bf-blender-cvs] [9fc36300de5] greasepencil-object: UI: Fix curve controls

[Antonio Vazquez]

Commit: 9fc36300de5ab0897b7ab22fadf3d073cacd8d2f
Author: Antonio Vazquez
Date:   Thu May 31 11:58:08 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB9fc36300de5ab0897b7ab22fadf3d073cacd8d2f

UI: Fix curve controls

The template_curve_mapping is not working inside a box layout..

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	release/scripts/startup/bl_ui/space_view3d_toolbar.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 8b553c45626..5b4ac4baa5f 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -332,9 +332,8 @@ class GreasePencilMultiFramePanel:
         col.prop(settings, "use_multiframe_falloff")
 
         # Falloff curve
-        box = col.box()
-        box.enabled = gpd.use_multiedit and settings.use_multiframe_falloff
-        box.template_curve_mapping(settings, "multiframe_falloff_curve", brush=True)
+        if gpd.use_multiedit and settings.use_multiframe_falloff:
+            layout.template_curve_mapping(settings, "multiframe_falloff_curve", brush=True)
 
 
 class GreasePencilAppearancePanel:
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 07ebe8163c9..25110c61344 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1473,16 +1473,13 @@ class VIEW3D_PT_tools_grease_pencil_brushcurves(View3DPanel, Panel):
 
         # Brush
         layout.label("Sensitivity")
-        box = layout.box()
-        box.template_curve_mapping(gp_settings, "curve_sensitivity", brush=True)
+        layout.template_curve_mapping(gp_settings, "curve_sensitivity", brush=True)
 
         layout.label("Strength")
-        box = layout.box()
-        box.template_curve_mapping(gp_settings, "curve_strength", brush=True)
+        layout.template_curve_mapping(gp_settings, "curve_strength", brush=True)
 
         layout.label("Jitter")
-        box = layout.box()
-        box.template_curve_mapping(gp_settings, "curve_jitter", brush=True)
+        layout.template_curve_mapping(gp_settings, "curve_jitter", brush=True)
 
 
 # Grease Pencil create shapes
@@ -1549,9 +1546,8 @@ class VIEW3D_PT_tools_grease_pencil_interpolate(Panel):
         col.label(text="Sequence Options:")
         col.prop(settings, "type")
         if settings.type == 'CUSTOM':
-            box = layout.box()
             # TODO: Options for loading/saving curve presets?
-            box.template_curve_mapping(settings, "interpolation_curve", brush=True)
+            col.template_curve_mapping(settings, "interpolation_curve", brush=True)
         elif settings.type != 'LINEAR':
             col.prop(settings, "easing")