X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Flayer_shape.cpp;h=dc6f937828e7dd0326aff601ffeb54d6992b627d;hb=334e15ce6c4d9b1f30a168a55e7ef4d31320d568;hp=287d0002b0e5eb3c0ae32e62ac26c0b18644f8a0;hpb=cb62e70ceca2a6544051a8d893395b0c0e73658b;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/layer_shape.cpp b/synfig-core/trunk/src/synfig/layer_shape.cpp
index 287d000..dc6f937 100644
--- a/synfig-core/trunk/src/synfig/layer_shape.cpp
+++ b/synfig-core/trunk/src/synfig/layer_shape.cpp
@@ -245,11 +245,13 @@ struct MonoSegment
 		//assumes that the rect culled away anything that would be beyond the edges
 		if(ydir > 0)
 		{
-			while(y > (*++p)[1]);
+			while(y > (*++p)[1])
+				;
 		}
 		else
 		{
-			while(y < (*++p)[1]);
+			while(y < (*++p)[1])
+				;
 		}
 
 		//for the loop to break there must have been a slope (straight line would do nothing)
@@ -335,7 +337,7 @@ struct CurveArray
 		if( (y > ymax && y > p[1][1]) || (y < ymin && y < p[1][1]) ) return 0;
 
 		//degenerate line max
-		if(ymin == ymax == p[1][1])
+		if(ymin == ymax && ymax == p[1][1])
 			return 0;
 
 		//degenerate accept - to the right and crossing the base line
@@ -1149,7 +1151,9 @@ Layer_Shape::clear()
 bool
 Layer_Shape::set_param(const String & param, const ValueBase &value)
 {
-	IMPORT(color);
+	IMPORT_PLUS(color, { if (color.get_a() == 0) { if (converted_blend_) {
+					set_blend_method(Color::BLEND_ALPHA_OVER);
+					color.set_a(1); } else transparent_color_ = true; } });
 	IMPORT(offset);
 	IMPORT(invert);
 	IMPORT(antialias);
@@ -1187,7 +1191,7 @@ Layer_Shape::get_param_vocab()const
 		.set_description(_("Layer_Shape Color"))
 	);
 	ret.push_back(ParamDesc("offset")
-		.set_local_name(_("Position"))
+		.set_local_name(_("Offset"))
 	);
 	ret.push_back(ParamDesc("invert")
 		.set_local_name(_("Invert"))
@@ -2477,8 +2481,8 @@ Layer_Shape::accelerated_render(Context context,Surface *surface,int quality, co
 
 		Rect	nrect;
 
-		Real	pixelfeatherx = abs(feather/pw),
-				pixelfeathery = abs(feather/ph);
+		Real	pixelfeatherx = quality == 10 ? 0 : abs(feather/pw),
+				pixelfeathery = quality == 10 ? 0 : abs(feather/ph);
 
 		nrect.set_point((aabb.minx - tl[0])/pw,(aabb.miny - tl[1])/ph);
 		nrect.expand((aabb.maxx - tl[0])/pw,(aabb.maxy - tl[1])/ph);
@@ -2519,7 +2523,7 @@ Layer_Shape::accelerated_render(Context context,Surface *surface,int quality, co
 
 	if(cb && !cb->amount_complete(10000,10001+renddesc.get_h())) return false;
 
-	if(feather)
+	if(feather && quality != 10)
 	{
 		//we have to blur rather than be crappy