X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcolor.h;h=7c8a356cabf1df6b43a0f5e7b1ac8c582c4c31c3;hb=6c27d1b6cf4694a873542cb264c650893f2c6e0e;hp=22d05877c36a4990d6ea58d13b631f10ccd8f3f3;hpb=e680461905871f7a4fbe399dc67e2baed39f6cae;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/color.h b/synfig-core/trunk/src/synfig/color.h index 22d0587..7c8a356 100644 --- a/synfig-core/trunk/src/synfig/color.h +++ b/synfig-core/trunk/src/synfig/color.h @@ -477,7 +477,7 @@ public: BLEND_COMPOSITE=0, //!< Color A is composited onto B (Taking A's alpha into account) BLEND_STRAIGHT=1, //!< Straight linear interpolation from A->B (Alpha ignored) BLEND_ONTO=13, //!< Similar to BLEND_COMPOSITE, except that B's alpha is maintained - BLEND_STRAIGHT_ONTO=21, //!< \writeme + BLEND_STRAIGHT_ONTO=21, //!< \deprecated \writeme BLEND_BEHIND=12, //!< Similar to BLEND_COMPOSITE, except that B is composited onto A. BLEND_SCREEN=16, //!< \writeme BLEND_OVERLAY=20, //!< \writeme @@ -494,9 +494,9 @@ public: BLEND_SATURATION=10, //!< Preserves the magnitude of the UV Vector of color A BLEND_LUMINANCE=11, //!< Preserves the Y channel of color A - BLEND_ALPHA_BRIGHTEN=14, //!< If A is less opaque than B, use A - BLEND_ALPHA_DARKEN=15, //!< If A is more opaque than B, use B - BLEND_ALPHA_OVER=19, //!< multiply alphas and then straight blends using the amount + BLEND_ALPHA_BRIGHTEN=14, //!< \deprecated If A is less opaque than B, use A + 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 };