[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47317] branches/soc-2011-tomato/source/ blender/editors/mask/mask_ops.c: Small change to mask slide operator: if current weight goes below zero,

[Sergey Sharybin]

Revision: 47317
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47317
Author:   nazgul
Date:     2012-06-01 12:30:27 +0000 (Fri, 01 Jun 2012)
Log Message:
-----------
Small change to mask slide operator: if current weight goes below zero,
higher weights are still getting affected by weight delta.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c

Modified: branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c	2012-06-01 12:25:18 UTC (rev 47316)
+++ branches/soc-2011-tomato/source/blender/editors/mask/mask_ops.c	2012-06-01 12:30:27 UTC (rev 47317)
@@ -852,12 +852,14 @@
 
 					w = len_v2(vec);
 
-					if (dot_v2v2(no, vec) <= 0.0f)
-						w = 0.0f;
-
 					if (overall_feather) {
-						float delta = w - data->weight;
+						float delta;
 
+						if (dot_v2v2(no, vec) <= 0.0f)
+							w = -w;
+
+						delta = w - data->weight;
+
 						if (data->orig_spline == NULL) {
 							/* restore weight for currently sliding point, so orig_spline would be created
 							 * with original weights used
@@ -870,6 +872,9 @@
 						slide_point_delta_all_feather(data, delta);
 					}
 					else {
+						if (dot_v2v2(no, vec) <= 0.0f)
+							w = 0.0f;
+
 						if (data->orig_spline) {
 							/* restore possible overall feather changes */
 							slide_point_restore_spline(data);