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
path: root/source
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2013-10-16 05:49:11 +0400
committerAntony Riakiotakis <kalast@gmail.com>2013-10-16 05:49:11 +0400
commit4ae564bfa68dec93e07057ec42c5c4362abf1b73 (patch)
tree2109afe85697746c5fa8fc9bb61b7d2af32e6d0f /source
parente7f1e1aed1a9a83763baaccc26498ad5aa1b5757 (diff)
Fix part of #37087, brush curve becomes inverted when using the reset
curve button. From the bug report it also seems that positive slope curve presets are not always reset correctly. However I haven't seen any place where positive slope curve presets are used. This will fix the initial brush problem, however it might be good to investigate further if curve presets are to be used elsewhere. It looks like the issue is related to bezier curve calculation.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/interface/interface_templates.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 1a5ab57706f..c343115be30 100644
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1921,7 +1921,7 @@ static void curvemap_tools_dofunc(bContext *C, void *cumap_v, int event)
case UICURVE_FUNC_RESET_NEG:
case UICURVE_FUNC_RESET_POS: /* reset */
curvemap_reset(cuma, &cumap->clipr, cumap->preset,
- (event == -1) ? CURVEMAP_SLOPE_NEGATIVE : CURVEMAP_SLOPE_POSITIVE);
+ (event == UICURVE_FUNC_RESET_NEG) ? CURVEMAP_SLOPE_NEGATIVE : CURVEMAP_SLOPE_POSITIVE);
curvemapping_changed(cumap, FALSE);
break;
case UICURVE_FUNC_RESET_VIEW: