[Bf-blender-cvs] [e427056b2cb] greasepencil-object: New Object Origin Icon

Fri Jul 7 16:59:54 CEST 2017

Commit: e427056b2cb9478c77f2e171b181b27b7787e4ce
Author: Antonio Vazquez
Date:   Fri Jul 7 16:52:06 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBe427056b2cb9478c77f2e171b181b27b7787e4ce

New Object Origin Icon

This icon is used to define stroke placement

Designed by Matias Mendiola

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

M	release/datafiles/blender_icons.svg
A	release/datafiles/blender_icons16/icon16_obj_origin.dat
A	release/datafiles/blender_icons32/icon32_obj_origin.dat
M	source/blender/editors/include/UI_icons.h

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

diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index 014c82e3918..1b524c5b61f 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -14,9 +14,9 @@
    height="640"
    id="svg2"
    sodipodi:version="0.32"
-   inkscape:version="0.92.1 r15371"
+   inkscape:version="0.91 r13725"
    version="1.0"
-   sodipodi:docname="blender_icons.svg"
+   sodipodi:docname="blender_icons_new.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    style="display:inline;enable-background:new"
    inkscape:export-filename="blender_icons16.png"
@@ -31729,6 +31729,25 @@
        y1="65.644958"
        x2="50.371208"
        y2="62.960247" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1610-6"
+       id="linearGradient33545"
+       gradientUnits="userSpaceOnUse"
+       x1="189.76083"
+       y1="248.13905"
+       x2="116.05637"
+       y2="183.6826" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9030"
+       id="linearGradient33547"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-6,1.4603138e-6)"
+       x1="474.84375"
+       y1="75"
+       x2="477.5"
+       y2="77.5" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -31740,14 +31759,14 @@
      objecttolerance="10"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="225.96977"
-     inkscape:cy="378.2"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="383.5469"
+     inkscape:cy="395.0103"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1027"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:snap-nodes="true"
@@ -70462,7 +70481,7 @@
         </g>
         <path
            d="m 134.19651,245.03757 -6.46038,0"
-           style="fill:none;stroke:url(#linearGradient18665);stroke-width:4.85120249;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
+           style="fill:none;stroke:url(#linearGradient18665);stroke-width:4..85120249;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1"
            id="path41257"
            sodipodi:nodetypes="cc"
            inkscape:connector-curvature="0" />
@@ -93745,6 +93764,54 @@
            style="opacity:0.3;fill:none;stroke:#ffffff;stroke-width:1px;stroke-linecap:round" />
       </g>
     </g>
+    <g
+       style="display:inline;enable-background:new"
+       id="ICON_ORIGIN"
+       transform="translate(315.00208,-21.040241)"
+       inkscape:label="#ICON_ORIGIN">
+      <rect
+         style="display:inline;overflow:visible;visibility:visible;opacity:0;fill:#b3b3b3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.79999995;marker:none;enable-background:accumulate"
+         id="rect37586-3"
+         width="16"
+         height="16"
+         x="110"
+         y="178" />
+      <path
+         sodipodi:nodetypes="cccccccccccc"
+         id="path37608-1"
+         d="m 114.5,192.5 h -3 v -3 m 13,0 v 3 h -3 m -0.25,-13 h 3.25 v 3 m -13,0 v -3 h 3"
+         style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:#000000;stroke-width:2.4000001;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
+         inkscape:connector-curvature="0" />
+      <path
+         style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:url(#linearGradient33545);stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:new"
+         d="m 114.5,192.5 h -3 v -3 m 13,0 v 3 h -3 m -0.25,-13 h 3.25 v 3 m -13,0 v -3 h 3"
+         id="path37610-3"
+         sodipodi:nodetypes="cccccccccccc"
+         inkscape:connector-curvature="0" />
+      <g
+         style="display:inline;enable-background:new"
+         transform="translate(-352.73032,109.25636)"
+         id="g14791-4">
+        <rect
+           ry="1.4768832"
+           rx="1.4768832"
+           y="74.512817"
+           x="468.5"
+           height="3.9871812"
+           width="4.0018005"
+           id="rect14793-4"
+           style="display:inline;overflow:visible;visibility:visible;fill:#f09432;fill-opacity:1;fill-rule:nonzero;stroke:#462400;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.18177891;stroke-opacity:1;marker:none;enable-background:accumulate" />
+        <rect
+           rx="0.49075836"
+           ry="0.49075836"
+           style="display:inline;overflow:visible;visibility:visible;fill:none;stroke:url(#linearGradient33547);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:6.18177891;stroke-opacity:1;marker:none;enable-background:accumulate"
+           id="rect14795-4"
+           width="1.9981995"
+           height="2.012816"
+           x="469.5018"
+           y="75.5" />
+      </g>
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"
diff --git a/release/datafiles/blender_icons16/icon16_obj_origin.dat b/release/datafiles/blender_icons16/icon16_obj_origin.dat
new file mode 100644
index 00000000000..67078427366
Binary files /dev/null and b/release/datafiles/blender_icons16/icon16_obj_origin.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_obj_origin.dat b/release/datafiles/blender_icons32/icon32_obj_origin.dat
new file mode 100644
index 00000000000..41d583da6b5
Binary files /dev/null and b/release/datafiles/blender_icons32/icon32_obj_origin.dat differ
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index d751efb9c85..7aa4c88c8da 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -715,8 +715,8 @@ DEF_ICON(CLIPUV_DEHLT)
 DEF_ICON(CLIPUV_HLT)
 DEF_ICON(SNAP_PEEL_OBJECT)
 DEF_ICON(GRID)
+DEF_ICON(OBJ_ORIGIN)
 #ifndef DEF_ICON_BLANK_SKIP
-	DEF_ICON(BLANK221)
 	DEF_ICON(BLANK222)
 	DEF_ICON(BLANK224)
 	DEF_ICON(BLANK225)


