[Bf-blender-cvs] [845c32540f6] greasepencil-object: New icon for Outliner and changes in Stroke Paint icon
Antonio Vazquez
noreply at git.blender.org
Thu Jun 15 13:10:29 CEST 2017
Commit: 845c32540f65a87e8aa66ba8389069db18db80ed
Author: Antonio Vazquez
Date: Thu Jun 15 13:10:15 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB845c32540f65a87e8aa66ba8389069db18db80ed
New icon for Outliner and changes in Stroke Paint icon
The outliner icon for grease pencil must be gray to keep UI consistency.
Changed the stroke paint icon to make more visible.
Icon design credits go to Matias Mendiola
===================================================================
M release/datafiles/blender_icons.svg
M release/datafiles/blender_icons16/icon16_gpencil_stroke_paint.dat
A release/datafiles/blender_icons16/icon16_outliner_data_gpencil.dat
M release/datafiles/blender_icons32/icon32_gpencil_stroke_paint.dat
A release/datafiles/blender_icons32/icon32_outliner_data_gpencil.dat
M source/blender/editors/include/UI_icons.h
M source/blender/editors/space_outliner/outliner_draw.c
===================================================================
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index e040732730c..014c82e3918 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -31679,6 +31679,56 @@
id="rect57452-3-9-4"
style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient57454);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;marker:none;enable-background:accumulate" />
</mask>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient25108-1-0"
+ id="linearGradient18808"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,-21)"
+ x1="59.622501"
+ y1="54.1525"
+ x2="60.981617"
+ y2="55.566177" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient1610-2"
+ id="linearGradient18810"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-0.5,-21)"
+ x1="60.25"
+ y1="56.5"
+ x2="57.789688"
+ y2="54.130001" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient14829"
+ id="linearGradient18812"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-0.5,-21)"
+ x1="60.25"
+ y1="56.5"
+ x2="56"
+ y2="52.25" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient32877-9-6-8"
+ id="linearGradient18814"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-1.54625,-1)"
+ x1="63.666252"
+ y1="37.960625"
+ x2="60.676094"
+ y2="34.685287" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient23974-3-78-2"
+ id="linearGradient18816"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,-21)"
+ x1="52.17437"
+ y1="65.644958"
+ x2="50.371208"
+ y2="62.960247" />
</defs>
<sodipodi:namedview
id="base"
@@ -31690,9 +31740,9 @@
objecttolerance="10"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="12.979592"
- inkscape:cx="254.52808"
- inkscape:cy="121.75"
+ inkscape:zoom="1"
+ inkscape:cx="225.96977"
+ inkscape:cy="378.2"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
@@ -60369,7 +60419,7 @@
style="opacity:0.7;fill:none;stroke:#000000;stroke-width:3;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
- style="fill:none;stroke:#d2d2d2;stroke-width:1.60000002;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ style="fill:none;stroke:#d2d2d2;stroke-width:1.59874016;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 328.50261,168.45815 0.0576,-10.96002 10.94282,-0.0283"
id="path52899"
sodipodi:nodetypes="ccc"
@@ -93001,282 +93051,6 @@
style="opacity:0.51999996;fill:url(#radialGradient21448-8-143);fill-opacity:1;fill-rule:evenodd;stroke:none" />
</g>
</g>
- <g
- style="display:inline;enable-background:new;fill:#deaa87"
- transform="translate(189.10958,398.49109)"
- id="ICON_GREASEPENCIL-7">
- <path
- id="path40242-9"
- style="display:inline;overflow:visible;visibility:visible;fill:#deaa87;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;enable-background:accumulate"
- d="M 52.75,44.25 62.5,34.5 c 0,-1 -0.5,-1.5 -1,-2 -0.498692,-0.498692 -1,-1 -2,-1 l -9.75,9.75 c 1,0 1.501308,0.501308 2,1 0.5,0.5 1,1 1,2 z"
- sodipodi:nodetypes="ccsccsc"
- inkscape:connector-curvature="0" />
- <rect
- y="31"
- x="47"
- height="16"
- width="16"
- id="rect40244-3"
- style="display:inline;overflow:visible;visibility:visible;opacity:0.01000001;fill:#deaa87;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;enable-background:new" />
- <path
- sodipodi:nodetypes="ccsccc"
- d="M 60.75,36.25 62.5,34.5 c 0,-1 -0.5,-1.5 -1,-2 -0.498692,-0.498692 -1,-1 -2,-1 l -1.75,1.75 3,3 z"
- style="display:inline;overflow:visible;visibility:visible;fill:#deaa87;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;enable-background:accumulate"
- id="path40246-0"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccc"
- d="m 57.5,35.5 -1,-1 -6.75,6.75 1.75,0.25 6,-6 z"
- style="display:inline;overflow:visible;visibility:visible;fill:#deaa87;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;enable-background:accumulate"
- id="path40248-3"
- inkscape:connector-curvature="0" />
- <path
- id="path40250-7"
- style="display:inline;overflow:visible;visibility:visible;fill:#deaa87;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;enable-background:accumulate"
- d="m 59.5,37.25 -1,-0.75 -6,6 0.25,1.5 6.75,-6.75 z"
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cc"
- id="path40252-1"
- d="m 59.75,37.25 -3,-3"
- style="fill:#deaa87;stroke:url(#linearGradient18108);stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#deaa87;stroke:url(#linearGradient18110);stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- d="m 60.75,36.25 -3,-3"
- id="path40254-4"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#deaa87;fill-opacity:1;stroke-width:1px"
- d="m 57.75,33.25 2.98375,3.003125 -1.0075,1.0075 -3.0225,-2.98375 L 57.75,33.25 Z"
- id="path40256-5"
- sodipodi:nodetypes="ccccc"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#deaa87;stroke:#501616;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
- d="m 61,36 1.5,-1.5 c 0,-1 -0.5,-1.5 -1,-2 -0.498692,-0.498692 -1,-1 -2,-1 L 58,33"
- id="path40258-8"
- sodipodi:nodetypes="ccscc"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccccccc"
- id="path40260-8"
- d="M 58.25,32.75 50,41 l -2,4 -0.5,0.5 0.25,0.75 0.75,0.25 0.5,-0.5 4,-2 8.25,-8.25"
- style="fill:#deaa87;stroke:#000000;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="ccccsc"
- id="path40262-3"
- d="M 50.25,41 48.5,44.25 49.75,45.5 53,43.75 C 53,43.25 52.5,42.5 52,42 51.501308,41.501308 50.75,41 50.25,41 Z"
- style="fill:#deaa87;fill-opacity:1;stroke-width:1px"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#deaa87;stroke:#22280b;stroke-width:2.4000001;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none"
- d="m 48.25,45.75 0.5,-0.5"
- id="path40264-2"
- sodipodi:nodetypes="cc"
- inkscape:connector-curvature="0" />
- <path
- sodipodi:nodetypes="cc"
- id="path40266-8"
- d="M 48.25,45.75 48.5,45.5"
- style="fill:#deaa87;stroke:#9ab432;stroke-width:1.10000002;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
- inkscape:connector-curvature="0" />
- <path
- style="opacity:0.3;fill:#deaa87;stroke:#ffffff;stroke-width:1px;stroke-linecap:round"
- d="M 52.527427,43.527587 61.514313,34.48568"
- id="path40268-9"
- inkscape:connector-curvature="0" />
- </g>
- <path
- style="fill:#ef8c21;fill-opacity:1"
- d="m 240.26637,439.81396 c -0.13355,-0.085 -0.31696,-0.18135 -0.40759,-0.21408 -0.0906,-0.0327 -0.16477,-0.0682 -0.16477,-0.0787 0,-0.0106 1.39696,-1.41614 3.10436,-3.12345 l 3.10436,-3.10422 0.34746,0.34617 0.34747,0.34616 -2.99212,2.99227 c -1.64567,1.64575 -3.01558,2.99187 -3.04424,2.99137 -0.0287,-4.9e-4 -0.16137,-0.0705 -0.29493,-0.15548 z"
- id="path18116"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#faad5a;fill-opacity:1"
- d="m 240.31904,439.83381 c -0.0833,-0.0536 -0.24721,-0.14185 -0.36423,-0.19618 -0.11702,-0.0543 -0.2199,-0.1038 -0.22862,-0.10992 -0.009,-0.006 1.38041,-1.40747 3.08696,-3.1141 l 3.10282,-3.10297 0.33881,0.33754 0.33881,0.33754 -1.44851,1.45109 c -2.58875,2.59337 -4.54254,4.49897 -4.61033,4.49662 -0.0353,-0.001 -0.1324,-0.046 -0.21571,-0.0996 z"
- id="path18118"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#f9ab56;fill-opacity:1"
- d="m 240.13297,439.73337 c -0.20473,-0.10815 -0.37254,-0.20859 -0.37291,-0.22319 -3.6e-4,-0.0146 1.38376,-1.41629 3.07582,-3.11484 l 3.07649,-3.08829 0.34303,0.33974 0.34303,0.33973 -2.3008,2.28688 c -2.20085,2.18753 -3.72367,3.66548 -3.77052,3.65943 -0.012,-0.002 -0.18941,-0.0913 -0.39414,-0.19946 z"
- id="path18122"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ff7f2a;fill-opacity:1"
- d="m 240.1323,439.74056 c -0.2051,-0.10593 -0.3729,-0.20919 -0.3729,-0.22947 0,-0.0203 1.38486,-1.42404 3.07747,-3.11947 l 3.07748,-3.08259 0.34161,0.33875 0.34161,0.33874 -2.38806,2.37619 c -2.26065,2.24939 -3.62593,3.57448 -3.68002,3.57169 -0.0134,-6.9e-4 -0.19209,-0.0879 -0.39719,-0.19384 z"
- id="path18126"
- inkscape:connector-curvature="0" />
- <path
- style="fill:#ffccaa;fill-opacity:1"
- d="m
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list