[Bf-blender-cvs] [f67c644] master: Cleanup SVG icon file, pass II.

Bastien Montagne noreply at git.blender.org
Tue Jan 20 21:55:15 CET 2015


Commit: f67c6445e1387769a36d031272bcb7bf86c67b7a
Author: Bastien Montagne
Date:   Tue Jan 20 20:05:54 2015 +0100
Branches: master
https://developer.blender.org/rBf67c6445e1387769a36d031272bcb7bf86c67b7a

Cleanup SVG icon file, pass II.

Name each icon group from its define in Blender.

Simplifies searching for a given icon (in one way or the other), and could also be
useful one day in some scripting.

Also, removed/fixed more empty and stray groups...

Finally, found that we have several svg icons not linked to any defines, and one define
with no icon (dyntopo), would be nice to sort this one way or the other too.

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

M	release/datafiles/blender_icons.svg
M	source/blender/editors/include/UI_icons.h

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

diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index 8edda15..fc60d6c 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -4927,26 +4927,6 @@
        y1="-35.483223"
        x2="408.75"
        y2="-40.000008" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient37542"
-       id="linearGradient17429"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.081988,0,0,1.0833333,-394.58897,440.54169)"
-       x1="326.51352"
-       y1="32.007874"
-       x2="347.91187"
-       y2="57.261913" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient319"
-       id="linearGradient17431"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0983862,0,0,1.0999999,-400.00857,439.95001)"
-       x1="317.30908"
-       y1="22.7787"
-       x2="330.87869"
-       y2="38.161732" />
     <mask
        maskUnits="userSpaceOnUse"
        id="mask17570">
@@ -22118,15 +22098,6 @@
        y2="360.82117" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient29757"
-       id="linearGradient29763"
-       x1="-224.85715"
-       y1="205.71428"
-       x2="-214.42857"
-       y2="206"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient23705-0"
        id="linearGradient22892-4"
        gradientUnits="userSpaceOnUse"
@@ -30020,6 +29991,102 @@
        y1="22.7787"
        x2="330.87869"
        y2="38.161732" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient18105-2-9"
+       id="linearGradient18618"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.04935997,1.9792524)"
+       x1="492.95264"
+       y1="267.42996"
+       x2="496.73859"
+       y2="270.36874" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15531-9-5"
+       id="linearGradient18620"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9993234,0,0,1.0050357,383.02168,218.70121)"
+       x1="116.41398"
+       y1="53.197613"
+       x2="109.72195"
+       y2="43.434277" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient23974-27-5"
+       id="linearGradient18622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9993234,0,0,1.0050357,383.02168,218.70121)"
+       x1="116.41398"
+       y1="53.197613"
+       x2="104.06187"
+       y2="53.601826" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient27277-1-8"
+       id="linearGradient18624"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.04935997,1.9965991)"
+       x1="501.19104"
+       y1="270.69452"
+       x2="488.93024"
+       y2="272.60611" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient21327-63-5"
+       id="linearGradient18626"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.04935997,0.97920913)"
+       x1="500.71924"
+       y1="270.24997"
+       x2="477"
+       y2="274" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient27301-6-2"
+       id="linearGradient18628"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.04936017,-0.04091017)"
+       x1="497"
+       y1="264"
+       x2="507.125"
+       y2="276.75" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient37542"
+       id="linearGradient18663"
+       gradientUnits="userSpaceOnUse"
+       x1="98.858559"
+       y1="80.045052"
+       x2="135.00615"
+       y2="122.92735" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient319"
+       id="linearGradient18665"
+       gradientUnits="userSpaceOnUse"
+       x1="130.75166"
+       y1="245.03757"
+       x2="129.24866"
+       y2="243.31177" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient319"
+       id="linearGradient18667"
+       gradientUnits="userSpaceOnUse"
+       x1="126.37006"
+       y1="112.31642"
+       x2="144.22272"
+       y2="129.82761" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9030"
+       id="linearGradient18669"
+       gradientUnits="userSpaceOnUse"
+       x1="190.68166"
+       y1="244.14676"
+       x2="174.75458"
+       y2="226.33672" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -30031,11 +30098,11 @@
      objecttolerance="10000"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.5566406"
-     inkscape:cx="407.03725"
-     inkscape:cy="192.8246"
+     inkscape:zoom="11.740919"
+     inkscape:cx="291.42828"
+     inkscape:cy="63.791344"
      inkscape:document-units="px"
-     inkscape:current-layer="layer1"
+     inkscape:current-layer="ICON_BORDER_LASSO"
      showgrid="true"
      inkscape:window-width="1920"
      inkscape:window-height="995"
@@ -38040,7 +38107,7 @@
     <g
        transform="matrix(0,1,1,0,-174,194)"
        style="display:inline;enable-background:new"
-       id="g106468-0">
+       id="ICON_DOWNARROW_HLT">
       <g
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
@@ -38075,7 +38142,7 @@
        inkscape:export-xdpi="90"
        inkscape:export-filename="/home/georg/Arbeitsfläche/2012/Blender Coding/Patch #2a/icon_redone 5a.png"
        transform="translate(440.42789,-242.41778)"
-       id="g14713">
+       id="ICON_FILE_BACKUP">
       <g
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
@@ -38189,7 +38256,7 @@
                id="path14745" />
             <path
                transform="matrix(3.625,0,0,3.1690202,-67.8125,318.31703)"
-               d="m 14.5,57.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+               d="m 14.5,57.5 a 1,1.0000004 0 1 1 -2,0 1,1.0000004 0 1 1 2,0 z"
                sodipodi:ry="1.0000004"
                sodipodi:rx="1"
                sodipodi:cy="57.5"
@@ -38206,7 +38273,7 @@
           </g>
           <path
              transform="matrix(3.5999897,0,0,3.1249932,-67.499871,320.6879)"
-             d="m 14.5,57.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+             d="m 14.5,57.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
              sodipodi:ry="1"
              sodipodi:rx="1"
              sodipodi:cy="57.5"
@@ -38228,11 +38295,11 @@
              sodipodi:cy="57.5"
              sodipodi:rx="1"
              sodipodi:ry="1"
-             d="m 14.5,57.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+             d="m 14.5,57.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
              transform="matrix(3.25,0,0,3.25,-62.875,313.125)" />
           <path
              transform="matrix(2,0,0,2,-46,385)"
-             d="m 14.5,57.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+             d="m 14.5,57.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
              sodipodi:ry="1"
              sodipodi:rx="1"
              sodipodi:cy="57.5"
@@ -38248,7 +38315,7 @@
              sodipodi:cy="57.5"
              sodipodi:rx="1"
              sodipodi:ry="1"
-             d="m 14.5,57.5 c 0,0.552285 -0.447715,1 -1,1 -0.552285,0 -1,-0.447715 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z"
+             d="m 14.5,57.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
              transform="matrix(4.7519907,0,0,4.1435313,-83.051884,262.12196)" />
           <path
              inkscape:connector-curvature="0"
@@ -38268,149 +38335,7 @@
          inkscape:export-ydpi="90" />
     </g>
     <g
-       style="display:inline;enable-background:new"
-       id="g14765"
-       inkscape:export-filename="/home/georg/Arbeitsfläche/2012/Blender Coding/Patch #2a/icon_big_redone 5a.png"
-       inkscape:export-xdpi="90"
-       inkscape:export-ydpi="90"
-       transform="translate(1090.1244,-109.28264)">
-      <rect
-         ry="0"
-         rx="2.4004419"
-         y="336.28265"
-         x="-78.124435"
-         height="48"
-         width="48"
-         id="rect14767"
-         style="opacity:0;fill:#cccccc;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-      <path
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="C:\Documents and Settings\Tata\Pulpit\BLENDER ICONSET\Kopia blender\.blender\icons\jendrzych's iconset.png"
-         sodipodi:nodetypes="cccccc"
-         id="path14769"
-         d="m -60.624426,339.78264 22.999995,0 0,41 -32.999995,0 0,-31 10,-10 z"
-         style="fill:url(#linearGradient14814);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;display:inline"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path14771"
-         style="opacity:0.7;fill:none;stroke:url(#linearGradient14816);stroke-width:0.99999994px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.56470588"
-         d="m -38.874431,340.78264 c -4.875,0 -21.749995,0 -21.749995,0 m -8.9447,8.5 -0.0553,30"
-         inkscape:export-filename="C:\Documents and Settings\Tata\Pulpit\BLENDER ICONSET\Kopia blender\.blender\icons\jendrzych's iconset.png"
-         inkscape:export-xdpi="90"
-         inkscape:export-ydpi="90"
-         inkscape:connector-curvature="0" />
-      <path
-         style="opacity:0.2;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter63011-8)"
-         d="m 115,444 12,0 -1,-11 -11,11 z"
-         id="path14773"
-         sodipodi:nodetypes="cccc"
-         inkscape:export-filename="C:\Documents

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list