From 4a1b87790d456453fa5a25f08588dd6d9e8e47f9 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Mon, 28 Apr 2014 13:49:00 +1200 Subject: Patch T39855: Icons for Interpolation Types (and Robert Penner easing) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch adds icons for each of the keyframe interpolation types (including the easing equations), as well as icons for the easing type options. Icons made by: Paulo José Oliveira Amaro (pauloup) Reviewed by: Joshua Leung, Thomas Beck --- source/blender/makesrna/intern/rna_curve.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'source/blender/makesrna/intern/rna_curve.c') diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index b82fac223c3..b99194066ca 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -71,24 +71,24 @@ EnumPropertyItem keyframe_handle_type_items[] = { EnumPropertyItem beztriple_interpolation_mode_items[] = { /* interpolation */ {0, "", 0, N_("Interpolation"), "Standard transitions between keyframes"}, - {BEZT_IPO_CONST, "CONSTANT", 0, "Constant", "No interpolation, value of A gets held until B is encountered"}, - {BEZT_IPO_LIN, "LINEAR", 0, "Linear", "Straight-line interpolation between A and B (i.e. no ease in/out)"}, - {BEZT_IPO_BEZ, "BEZIER", 0, "Bezier", "Smooth interpolation between A and B, with some control over curve shape"}, + {BEZT_IPO_CONST, "CONSTANT", ICON_IPO_CONSTANT, "Constant", "No interpolation, value of A gets held until B is encountered"}, + {BEZT_IPO_LIN, "LINEAR", ICON_IPO_LINEAR, "Linear", "Straight-line interpolation between A and B (i.e. no ease in/out)"}, + {BEZT_IPO_BEZ, "BEZIER", ICON_IPO_BEZIER, "Bezier", "Smooth interpolation between A and B, with some control over curve shape"}, /* easing */ {0, "", 0, N_("Easing (by strength)"), "Predefined inertial transitions, useful for motion graphics (from least to most ''dramatic'')"}, - {BEZT_IPO_SINE, "SINE", 0, "Sinusoidal", "Sinusoidal easing (weakest, almost linear but with a slight curvature)"}, - {BEZT_IPO_QUAD, "QUAD", 0, "Quadratic", "Quadratic easing"}, - {BEZT_IPO_CUBIC, "CUBIC", 0, "Cubic", "Cubic easing"}, - {BEZT_IPO_QUART, "QUART", 0, "Quartic", "Quartic easing"}, - {BEZT_IPO_QUINT, "QUINT", 0, "Quintic", "Quintic easing"}, - {BEZT_IPO_EXPO, "EXPO", 0, "Exponential", "Exponential easing (dramatic)"}, - {BEZT_IPO_CIRC, "CIRC", 0, "Circular", "Circular easing (strongest and most dynamic)"}, + {BEZT_IPO_SINE, "SINE", ICON_IPO_SINE, "Sinusoidal", "Sinusoidal easing (weakest, almost linear but with a slight curvature)"}, + {BEZT_IPO_QUAD, "QUAD", ICON_IPO_QUAD, "Quadratic", "Quadratic easing"}, + {BEZT_IPO_CUBIC, "CUBIC", ICON_IPO_CUBIC, "Cubic", "Cubic easing"}, + {BEZT_IPO_QUART, "QUART", ICON_IPO_QUART, "Quartic", "Quartic easing"}, + {BEZT_IPO_QUINT, "QUINT", ICON_IPO_QUINT, "Quintic", "Quintic easing"}, + {BEZT_IPO_EXPO, "EXPO", ICON_IPO_EXPO, "Exponential", "Exponential easing (dramatic)"}, + {BEZT_IPO_CIRC, "CIRC", ICON_IPO_CIRC, "Circular", "Circular easing (strongest and most dynamic)"}, {0, "", 0, N_("Dynamic Effects"), "Simple physics-inspired easing effects"}, - {BEZT_IPO_BACK, "BACK", 0, "Back", "Cubic easing with overshoot and settle"}, - {BEZT_IPO_BOUNCE, "BOUNCE", 0, "Bounce", "Exponentially decaying parabolic bounce, like when objects collide"}, - {BEZT_IPO_ELASTIC, "ELASTIC", 0, "Elastic", "Exponentially decaying sine wave, like an elastic band"}, + {BEZT_IPO_BACK, "BACK", ICON_IPO_BACK, "Back", "Cubic easing with overshoot and settle"}, + {BEZT_IPO_BOUNCE, "BOUNCE", ICON_IPO_BOUNCE, "Bounce", "Exponentially decaying parabolic bounce, like when objects collide"}, + {BEZT_IPO_ELASTIC, "ELASTIC", ICON_IPO_ELASTIC, "Elastic", "Exponentially decaying sine wave, like an elastic band"}, {0, NULL, 0, NULL, NULL} }; -- cgit v1.2.3