[Bf-blender-cvs] [4a1b877] master: Patch T39855: Icons for Interpolation Types (and Robert Penner easing)

Joshua Leung noreply at git.blender.org
Mon Apr 28 03:50:06 CEST 2014


Commit: 4a1b87790d456453fa5a25f08588dd6d9e8e47f9
Author: Joshua Leung
Date:   Mon Apr 28 13:49:00 2014 +1200
https://developer.blender.org/rB4a1b87790d456453fa5a25f08588dd6d9e8e47f9

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

===================================================================

M	release/datafiles/blender_icons.svg
A	release/datafiles/blender_icons16/icon16_ipo_back.dat
A	release/datafiles/blender_icons16/icon16_ipo_bezier.dat
A	release/datafiles/blender_icons16/icon16_ipo_bounce.dat
A	release/datafiles/blender_icons16/icon16_ipo_circ.dat
A	release/datafiles/blender_icons16/icon16_ipo_constant.dat
A	release/datafiles/blender_icons16/icon16_ipo_cubic.dat
A	release/datafiles/blender_icons16/icon16_ipo_ease_in.dat
A	release/datafiles/blender_icons16/icon16_ipo_ease_in_out.dat
A	release/datafiles/blender_icons16/icon16_ipo_ease_out.dat
A	release/datafiles/blender_icons16/icon16_ipo_elastic.dat
A	release/datafiles/blender_icons16/icon16_ipo_expo.dat
A	release/datafiles/blender_icons16/icon16_ipo_linear.dat
A	release/datafiles/blender_icons16/icon16_ipo_quad.dat
A	release/datafiles/blender_icons16/icon16_ipo_quart.dat
A	release/datafiles/blender_icons16/icon16_ipo_quint.dat
A	release/datafiles/blender_icons16/icon16_ipo_sine.dat
A	release/datafiles/blender_icons32/icon32_ipo_back.dat
A	release/datafiles/blender_icons32/icon32_ipo_bezier.dat
A	release/datafiles/blender_icons32/icon32_ipo_bounce.dat
A	release/datafiles/blender_icons32/icon32_ipo_circ.dat
A	release/datafiles/blender_icons32/icon32_ipo_constant.dat
A	release/datafiles/blender_icons32/icon32_ipo_cubic.dat
A	release/datafiles/blender_icons32/icon32_ipo_ease_in.dat
A	release/datafiles/blender_icons32/icon32_ipo_ease_in_out.dat
A	release/datafiles/blender_icons32/icon32_ipo_ease_out.dat
A	release/datafiles/blender_icons32/icon32_ipo_elastic.dat
A	release/datafiles/blender_icons32/icon32_ipo_expo.dat
A	release/datafiles/blender_icons32/icon32_ipo_linear.dat
A	release/datafiles/blender_icons32/icon32_ipo_quad.dat
A	release/datafiles/blender_icons32/icon32_ipo_quart.dat
A	release/datafiles/blender_icons32/icon32_ipo_quint.dat
A	release/datafiles/blender_icons32/icon32_ipo_sine.dat
M	source/blender/editors/include/UI_icons.h
M	source/blender/makesrna/intern/rna_curve.c
M	source/blender/makesrna/intern/rna_fcurve.c

===================================================================

diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index 84ccb81..6ebba80 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -14,7 +14,7 @@
    height="640"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.48.4 r9939"
+   inkscape:version="0.48.4 r"
    version="1.0"
    sodipodi:docname="blender_icons.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
@@ -27448,6 +27448,675 @@
          style="stop-color:#b7b7b7;stop-opacity:1;"
          id="stop16830-7" />
     </radialGradient>
+    <linearGradient
+       id="linearGradient18748-9"
+       inkscape:collect="always">
+      <stop
+         id="stop18750-7"
+         offset="0"
+         style="stop-color:#5894d4;stop-opacity:1" />
+      <stop
+         id="stop18752-0"
+         offset="1"
+         style="stop-color:#afd1f5;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4980">
+      <stop
+         style="stop-color:#5894d4;stop-opacity:1"
+         offset="0"
+         id="stop4982" />
+      <stop
+         style="stop-color:#afd1f5;stop-opacity:1"
+         offset="1"
+         id="stop4984" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient8225-5-1-0-9-5">
+      <stop
+         style="stop-color:#84d458;stop-opacity:1"
+         offset="0"
+         id="stop8227-8-1-1-0-9" />
+      <stop
+         style="stop-color:#c8f5af;stop-opacity:1"
+         offset="1"
+         id="stop8229-7-3-1-4-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6369-5">
+      <stop
+         style="stop-color:#0d1e00;stop-opacity:1"
+         offset="0"
+         id="stop6371-3" />
+      <stop
+         style="stop-color:#001128;stop-opacity:1"
+         offset="1"
+         id="stop6373-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16719">
+      <stop
+         id="stop16721"
+         offset="0"
+         style="stop-color:#84d458;stop-opacity:1" />
+      <stop
+         style="stop-color:#5894d4;stop-opacity:1"
+         offset="0.30000001"
+         id="stop5079" />
+      <stop
+         id="stop16723"
+         offset="1"
+         style="stop-color:#afd1f5;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6369-3-9">
+      <stop
+         style="stop-color:#0e1e00;stop-opacity:1"
+         offset="0"
+         id="stop6371-2-4" />
+      <stop
+         style="stop-color:#001d1e;stop-opacity:1"
+         offset="1"
+         id="stop6373-0-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7701-5"
+       inkscape:collect="always">
+      <stop
+         id="stop7703-5"
+         offset="0"
+         style="stop-color:#84d458;stop-opacity:1" />
+      <stop
+         style="stop-color:#3dc0c7;stop-opacity:1"
+         offset="0.40000027"
+         id="stop5081" />
+      <stop
+         id="stop7705-2"
+         offset="1"
+         style="stop-color:#aff1f5;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5153"
+       inkscape:collect="always">
+      <stop
+         id="stop5155"
+         offset="0"
+         style="stop-color:#84d458;stop-opacity:1" />
+      <stop
+         id="stop5157"
+         offset="1"
+         style="stop-color:#c8f5af;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6522-6">
+      <stop
+         style="stop-color:#0e1e00;stop-opacity:1"
+         offset="0"
+         id="stop6524-8" />
+      <stop
+         style="stop-color:#1b1f09;stop-opacity:1"
+         offset="1"
+         id="stop6526-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient16332-1">
+      <stop
+         style="stop-color:#84d458;stop-opacity:1"
+         offset="0"
+         id="stop16334-5" />
+      <stop
+         id="stop5161"
+         offset="0.37500033"
+         style="stop-color:#b5d034;stop-opacity:1" />
+      <stop
+         style="stop-color:#e9f5af;stop-opacity:1"
+         offset="1"
+         id="stop16336-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6541-9">
+      <stop
+         style="stop-color:#132701;stop-opacity:1"
+         offset="0"
+         id="stop6543-9" />
+      <stop
+         style="stop-color:#282100;stop-opacity:1"
+         offset="1"
+         id="stop6545-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient15955-8"
+       inkscape:collect="always">
+      <stop
+         id="stop15957-7"
+         offset="0"
+         style="stop-color:#90d868;stop-opacity:1" />
+      <stop
+         style="stop-color:#dacf2a;stop-opacity:1"
+         offset="0.37500033"
+         id="stop5163" />
+      <stop
+         id="stop15959-4"
+         offset="1"
+         style="stop-color:#f5f1af;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6582-2">
+      <stop
+         style="stop-color:#282100;stop-opacity:1"
+         offset="0"
+         id="stop6584-4" />
+      <stop
+         style="stop-color:#201308;stop-opacity:1"
+         offset="1"
+         id="stop6586-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient16021-1">
+      <stop
+         style="stop-color:#dacf2a;stop-opacity:1"
+         offset="0"
+         id="stop16023-4" />
+      <stop
+         id="stop5391"
+         offset="0.37792677"
+         style="stop-color:#ff9a2d;stop-opacity:1" />
+      <stop
+         style="stop-color:#f3c59d;stop-opacity:1"
+         offset="1"
+         id="stop16025-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6590-1">
+      <stop
+         style="stop-color:#290b11;stop-opacity:1"
+         offset="0"
+         id="stop6592-1" />
+      <stop
+         style="stop-color:#271301;stop-opacity:1"
+         offset="1"
+         id="stop6594-7" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient16066-6"
+       inkscape:collect="always">
+      <stop
+         id="stop16068-8"
+         offset="0"
+         style="stop-color:#f13b60;stop-opacity:1" />
+      <stop
+         style="stop-color:#ff9a2d;stop-opacity:1"
+         offset="0.49796259"
+         id="stop4718" />
+      <stop
+         id="stop16070-9"
+         offset="1"
+         style="stop-color:#f3c59d;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6668-2">
+      <stop
+         style="stop-color:#001128;stop-opacity:1"
+         offset="0"
+         id="stop6670-8" />
+      <stop
+         style="stop-color:#200820;stop-opacity:1"
+         offset="1"
+         id="stop6672-3" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12160"
+       inkscape:collect="always">
+      <stop
+         id="stop12162"
+         offset="0"
+         style="stop-color:#5894d4;stop-opacity:1" />
+      <stop
+         style="stop-color:#ef79ef;stop-opacity:1"
+         offset="0.72727275"
+         id="stop12164" />
+      <stop
+         id="stop12166"
+         offset="1"
+         style="stop-color:#f7bcf7;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5660"
+       inkscape:collect="always">
+      <stop
+         id="stop5662"
+         offset="0"
+         style="stop-color:#001128;stop-opacity:1" />
+      <stop
+         id="stop5664"
+         offset="1"
+         style="stop-color:#200820;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11820">
+      <stop
+         style="stop-color:#afd1f5;stop-opacity:1"
+         offset="0"
+         id="stop11822" />
+      <stop
+         id="stop11824"
+         offset="0.44444144"
+         style="stop-color:#5894d4;stop-opacity:1" />
+      <stop
+         style="stop-color:#5894d4;stop-opacity:1"
+         offset="0.55555254"
+         id="stop11826" />
+      <stop
+         style="stop-color:#ef79ef;stop-opacity:1"
+         offset="1"
+         id="stop11828" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6668-0-4">
+      <stop
+         style="stop-color:#001128;stop-opacity:1"
+         offset="0"
+         id="stop6670-5-2" />
+      <stop
+         style="stop-color:#200820;stop-opacity:1"
+         offset="1"
+         id="stop6672-0-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10750"
+       inkscape:collect="always">
+      <stop
+         id="stop10752"
+         offset="0"
+         style="stop-color:#afd1f5;stop-opacity:1" />
+      <stop
+         style="stop-color:#5894d4;stop-opacity:1"
+         offset="0.43061388"
+         id="stop10754" />
+      <stop
+         style="stop-color:#5894d4;stop-opacity:1"
+         offset="0.77194387"
+         id="stop10756" />
+      <stop
+         id="stop10758"
+         offset="1"
+         style="stop-color:#ef79ef;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient17527-8-91-7">
+      <stop
+         style="stop-color:#0a0a0a;stop-opacity:1"
+         offset="0"
+         id="stop17529-0-2-6" />
+      <stop
+         style="stop-color:#001128;stop-opacity:1"
+         offset="1"
+         id="stop17531-0-6-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient28135-1-17"
+       inkscape:collect="always">
+      <stop
+         id="stop28137-7-06"
+         offset="0"
+         style="stop-color:#afd1f5;stop-opacity:1" />
+      <stop
+         style="stop-color:#5894d4;stop-opacity:1"
+         offset="0.42811331"
+         id="stop5393" />
+      <stop
+         id="stop28139-7-9"
+         offset="1"
+         style="stop-color:#505050

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list