Patch T39855: Icons for Interpolation Types (and Robert Penner easing)

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

3 files changed, 35 insertions, 32 deletions

diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index 4e15f3ee881..eeb54986034 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -643,22 +643,25 @@ DEF_ICON(FRAME_NEXT)
 #ifndef DEF_ICON_BLANK_SKIP
 	/* available */
 	DEF_ICON(BLANK186)
-	DEF_ICON(BLANK187)
-	DEF_ICON(BLANK188)
-	DEF_ICON(BLANK189)
-	DEF_ICON(BLANK190)
-	DEF_ICON(BLANK191)
-	DEF_ICON(BLANK192)
-	DEF_ICON(BLANK193)
-	DEF_ICON(BLANK194)
-	DEF_ICON(BLANK195)
-	DEF_ICON(BLANK196)
-	DEF_ICON(BLANK197)
-	DEF_ICON(BLANK198)
-	DEF_ICON(BLANK199)
-	DEF_ICON(BLANK200)
-	DEF_ICON(BLANK201)
-	DEF_ICON(BLANK202)
+#endif
+DEF_ICON(IPO_CONSTANT)
+DEF_ICON(IPO_LINEAR)
+DEF_ICON(IPO_BEZIER)
+DEF_ICON(IPO_SINE)
+DEF_ICON(IPO_QUAD)
+DEF_ICON(IPO_CUBIC)
+DEF_ICON(IPO_QUART)
+DEF_ICON(IPO_QUINT)
+DEF_ICON(IPO_EXPO)
+DEF_ICON(IPO_CIRC)
+DEF_ICON(IPO_BOUNCE)
+DEF_ICON(IPO_ELASTIC)
+DEF_ICON(IPO_BACK)
+DEF_ICON(IPO_EASE_IN)
+DEF_ICON(IPO_EASE_OUT)
+DEF_ICON(IPO_EASE_IN_OUT)
+#ifndef DEF_ICON_BLANK_SKIP
+	/* available */
 	DEF_ICON(BLANK203)
 	DEF_ICON(BLANK204)
 	DEF_ICON(BLANK205)
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}
 };
diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c
index 55e60047194..c135ee2cd20 100644
--- a/source/blender/makesrna/intern/rna_fcurve.c
+++ b/source/blender/makesrna/intern/rna_fcurve.c
@@ -78,9 +78,9 @@ EnumPropertyItem beztriple_keyframe_type_items[] = {
 };
 
 EnumPropertyItem beztriple_interpolation_easing_items[] =  {
-	{BEZT_IPO_EASE_IN, "EASE_IN", 0, "Ease In", "Only on the end closest to the next keyframe"},
-	{BEZT_IPO_EASE_OUT, "EASE_OUT", 0, "Ease Out", "Only on the end closest to the first keyframe"},
-	{BEZT_IPO_EASE_IN_OUT, "EASE_IN_OUT", 0, "Ease In and Out", "Segment between both keyframes"},
+	{BEZT_IPO_EASE_IN, "EASE_IN", ICON_IPO_EASE_IN, "Ease In", "Only on the end closest to the next keyframe"},
+	{BEZT_IPO_EASE_OUT, "EASE_OUT", ICON_IPO_EASE_OUT, "Ease Out", "Only on the end closest to the first keyframe"},
+	{BEZT_IPO_EASE_IN_OUT, "EASE_IN_OUT", ICON_IPO_EASE_IN_OUT, "Ease In and Out", "Segment between both keyframes"},
 	{0, NULL, 0, NULL, NULL}
 };