Merge branch 'master' into genete_core_review

diff --combined synfig-core/src/synfig/color.h
index ee5f501,e2499f7..fc5f680
--- 1/synfig-core/src/synfig/color.h
--- 2/synfig-core/src/synfig/color.h
+++ b/synfig-core/src/synfig/color.h
@@@ -29,16 -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
@@@ -382,6 -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() */
@@@ -438,6 -443,7 +438,6 @@@
        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;
@@@ -492,7 -498,9 +492,9 @@@
                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 */