[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60791] trunk/blender/source/blender/ editors/interface/interface_templates.c: Fix part of #37087, brush curve becomes inverted when using the reset

Antony Riakiotakis kalast at gmail.com
Wed Oct 16 03:49:12 CEST 2013


Revision: 60791
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60791
Author:   psy-fi
Date:     2013-10-16 01:49:11 +0000 (Wed, 16 Oct 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_templates.c

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2013-10-15 23:11:41 UTC (rev 60790)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2013-10-16 01:49:11 UTC (rev 60791)
@@ -1921,7 +1921,7 @@
 		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:




More information about the Bf-blender-cvs mailing list