[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30018] branches/soc-2010-jwilkins/source/ blender/editors/sculpt_paint: * last merge did something weird in paint_image.c

[Jason Wilkins]

Revision: 30018
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30018
Author:   jwilkins
Date:     2010-07-06 10:09:11 +0200 (Tue, 06 Jul 2010)

Log Message:
-----------
* last merge did something weird in paint_image.c

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c

Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_image.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_image.c	2010-07-06 08:04:28 UTC (rev 30017)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/paint_image.c	2010-07-06 08:09:11 UTC (rev 30018)
@@ -1057,10 +1057,6 @@
 		a2 = shell_angle_to_dist(angle_normalized_v2v2(dir1, dir2) * ((float)M_PI/180.0f));
 		a3 = shell_angle_to_dist(angle_normalized_v2v2(dir2, dir3) * ((float)M_PI/180.0f));
 		a4 = shell_angle_to_dist(angle_normalized_v2v2(dir3, dir4) * ((float)M_PI/180.0f));
-		a1 = shell_angle_to_dist(angle_normalized_v2v2(dir4, dir1) * (float)(M_PI/180.0f));
-		a2 = shell_angle_to_dist(angle_normalized_v2v2(dir1, dir2) * (float)(M_PI/180.0f));
-		a3 = shell_angle_to_dist(angle_normalized_v2v2(dir2, dir3) * (float)(M_PI/180.0f));
-		a4 = shell_angle_to_dist(angle_normalized_v2v2(dir3, dir4) * (float)(M_PI/180.0f));
 	}
 	else {
 		a1 = shell_angle_to_dist(angle_normalized_v2v2(dir3, dir1) * ((float)M_PI/180.0f));

Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-07-06 08:04:28 UTC (rev 30017)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-07-06 08:09:11 UTC (rev 30018)
@@ -2564,6 +2564,7 @@
 			break;
 
 		case SCULPT_TOOL_SMOOTH:
+		case SCULPT_TOOL_LAYER:
 		default:
 			break;
 	}