X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Fsrc%2Fsynfig%2Fcolor.h;h=fc5f680baa441ac6abb49e8db1bc0512411964b2;hb=e0d9bcc7f95c8f0782f03b17ad10e008f573acb3;hp=d54b0e942ed69966b7e92efbb5c4c423e7a1799d;hpb=a095981e18cc37a8ecc7cd237cc22b9c10329264;p=synfig.git

diff --git a/synfig-core/src/synfig/color.h b/synfig-core/src/synfig/color.h
index d54b0e9..fc5f680 100644
--- a/synfig-core/src/synfig/color.h
+++ b/synfig-core/src/synfig/color.h
@@ -29,20 +29,16 @@
 /* === H E A D E R S ======================================================= */
 
 
-//#include <cmath>
 #include <math.h>
 #include <cassert>
 #include "gamma.h"
 #include <synfig/string.h>
+# include "angle.h"
 
 #ifdef USE_HALF_TYPE
 #include <OpenEXR/half.h>
 #endif
 
-#ifndef SYNFIG_NO_ANGLE
-# include "angle.h"
-#endif
-
 /* === M A C R O S ========================================================= */
 
 #define use_colorspace_gamma()	App::use_colorspace_gamma
@@ -386,7 +382,6 @@ public:
 	static Color YUV(const float& y, const float& u, const float& v, const value_type& a=1)
 		{ return Color().set_yuv(y,u,v).set_a(a); }
 
-#ifndef SYNFIG_NO_ANGLE
 	//! Returns the hue of the chromanance
 	/*!	This is the angle of the U and V components.
 	**	\see set_hue() */
@@ -443,7 +438,6 @@ public:
 	static Color YUV(const float& y, const float& s, const Angle& theta, const value_type& a=1)
 		{ return Color().set_yuv(y,s,theta).set_a(a); }
 
-#endif
 
 	//! Clamps a color so that its values are in range. Ignores attempting to visualize negative colors.
 	Color clamped()const;
@@ -498,7 +492,9 @@ public:
 		BLEND_ALPHA_DARKEN=15,		//!< \deprecated If A is more opaque than B, use B
 		BLEND_ALPHA_OVER=19,		//!< \deprecated multiply alphas and then straight blends using the amount
 
-		BLEND_END=22				//!< \internal
+		BLEND_END=22,				//!< \internal
+		BLEND_BY_LAYER=999			//! Used to let the layer decides what Blend Method use by
+									//! default when the layer is created
 	};
 
 	/* Other */