Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Oeser <info@graphics-engineer.com>2019-05-06 14:03:23 +0300
committerPhilipp Oeser <info@graphics-engineer.com>2019-05-06 14:44:22 +0300
commite9160eae95032d1be5c224ce450d6f7699767094 (patch)
treebb1719c04204a535a7ff53a26655a650fbec4f1f /release
parentd7ffb5cb0b9b44ffe4f005a8f9c89527d092cfef (diff)
Fix T64164: Resetting a curvemap could result in a mirrored curve
A template_curve_mapping with brush=True was always resetting the curve to a positive slope (descending from left to right). Behaviour is now changed so that specifying "use_negative_slope" is taken into account as well. Also use this for: - paint "cavity_curve" - gpencil "curve_sensitivity" / "curve_strength" / "curve_jitter" / "interpolation_curve" Reviewers: brecht Maniphest Tasks: T64164 Differential Revision: https://developer.blender.org/D4809
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_view3d_toolbar.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index d672984ca49..9610c16e344 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1490,7 +1490,8 @@ class VIEW3D_PT_tools_imagepaint_options_cavity(View3DPaintPanel, Panel):
layout.active = ipaint.use_cavity
- layout.template_curve_mapping(ipaint, "cavity_curve", brush=True)
+ layout.template_curve_mapping(ipaint, "cavity_curve", brush=True,
+ use_negative_slope=True)
# TODO, move to space_view3d.py
@@ -1870,7 +1871,8 @@ class VIEW3D_PT_tools_grease_pencil_brushcurves_sensitivity(View3DPanel, Panel):
brush = context.tool_settings.gpencil_paint.brush
gp_settings = brush.gpencil_settings
- layout.template_curve_mapping(gp_settings, "curve_sensitivity", brush=True)
+ layout.template_curve_mapping(gp_settings, "curve_sensitivity", brush=True,
+ use_negative_slope=True)
class VIEW3D_PT_tools_grease_pencil_brushcurves_strength(View3DPanel, Panel):
@@ -1885,7 +1887,8 @@ class VIEW3D_PT_tools_grease_pencil_brushcurves_strength(View3DPanel, Panel):
brush = context.tool_settings.gpencil_paint.brush
gp_settings = brush.gpencil_settings
- layout.template_curve_mapping(gp_settings, "curve_strength", brush=True)
+ layout.template_curve_mapping(gp_settings, "curve_strength", brush=True,
+ use_negative_slope=True)
class VIEW3D_PT_tools_grease_pencil_brushcurves_jitter(View3DPanel, Panel):
@@ -1900,7 +1903,8 @@ class VIEW3D_PT_tools_grease_pencil_brushcurves_jitter(View3DPanel, Panel):
brush = context.tool_settings.gpencil_paint.brush
gp_settings = brush.gpencil_settings
- layout.template_curve_mapping(gp_settings, "curve_jitter", brush=True)
+ layout.template_curve_mapping(gp_settings, "curve_jitter", brush=True,
+ use_negative_slope=True)
# Grease Pencil stroke editing tools
@@ -1942,7 +1946,8 @@ class VIEW3D_PT_tools_grease_pencil_interpolate(Panel):
col.prop(settings, "type")
if settings.type == 'CUSTOM':
# TODO: Options for loading/saving curve presets?
- col.template_curve_mapping(settings, "interpolation_curve", brush=True)
+ col.template_curve_mapping(settings, "interpolation_curve", brush=True,
+ use_negative_slope=True)
elif settings.type != 'LINEAR':
col.prop(settings, "easing")