[Bf-blender-cvs] [6249c596099] blender2.8: Greasepencil icons
Dalai Felinto
noreply at git.blender.org
Tue Jan 23 15:01:45 CET 2018
Commit: 6249c596099a4120a5c97a2169ea118eff4e9d31
Author: Dalai Felinto
Date: Tue Jan 23 11:55:32 2018 -0200
Branches: blender2.8
https://developer.blender.org/rB6249c596099a4120a5c97a2169ea118eff4e9d31
Greasepencil icons
Note this comes from the greasepencil-object branch, and are merged to help
preventing future merge conflicts.
Also, I renamed the icons for consistency sake. So when this is merged in 2.8
other areas of the code will need to change.
Icons by Matias Mendiola
===================================================================
M release/datafiles/blender_icons.svg
A release/datafiles/blender_icons16/icon16_greasepencil_stroke_paint.dat
A release/datafiles/blender_icons16/icon16_object_origin.dat
A release/datafiles/blender_icons16/icon16_outliner_data_greasepencil.dat
A release/datafiles/blender_icons16/icon16_outliner_ob_greasepencil.dat
A release/datafiles/blender_icons32/icon32_greasepencil_stroke_paint.dat
A release/datafiles/blender_icons32/icon32_object_origin.dat
A release/datafiles/blender_icons32/icon32_outliner_data_greasepencil.dat
A release/datafiles/blender_icons32/icon32_outliner_ob_greasepencil.dat
M source/blender/editors/include/UI_icons.h
===================================================================
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index e939758e816..44a1ebcbbf4 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -26,6 +26,21 @@
id="title49470">Blender icons v. 2.5.08</title>
<defs
id="defs4">
+ <linearGradient
+ id="linearGradient18906">
+ <stop
+ id="stop18904"
+ offset="0"
+ style="stop-color:#ffb36b;stop-opacity:1" />
+ <stop
+ style="stop-color:#ff982a;stop-opacity:1;"
+ offset="0.6832175"
+ id="stop18902" />
+ <stop
+ id="stop18900"
+ offset="1"
+ style="stop-color:#b45d00;stop-opacity:1;" />
+ </linearGradient>
<linearGradient
id="linearGradient31767"
inkscape:collect="always">
@@ -31346,13 +31361,14 @@
x1="189.76083"
y1="248.13905"
x2="116.05637"
- y2="183.6826" />
+ y2="183.6826"
+ gradientTransform="translate(335.99871,21.048284)" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient22562"
id="radialGradient23167-6"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.99220964,-0.12457927,0.11585516,0.92272644,-34.13325,22.766225)"
+ gradientTransform="matrix(0.5950386,-0.0747115,0.06947956,0.55336879,432.31142,44.44399)"
cx="-0.78262758"
cy="294.63174"
fx="-0.78262758"
@@ -31488,50 +31504,176 @@
offset="1"
id="stop3066" />
</linearGradient>
- <filter
- style="color-interpolation-filters:sRGB"
+ <linearGradient
inkscape:collect="always"
- x="-0.71999419"
- width="2.4399884"
- y="-0.72000581"
- height="2.4400115"
- id="filter31351-5">
- <feGaussianBlur
- inkscape:collect="always"
- stdDeviation="0.83077614"
- id="feGaussianBlur31353-3" />
- </filter>
+ xlink:href="#linearGradient18906"
+ id="linearGradient14276"
+ 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="linearGradient14278"
+ 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="linearGradient14280"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-0.5,-21)"
+ x1="60.25"
+ y1="56.5"
+ x2="56"
+ y2="52.25" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient15859-1-3"
+ id="linearGradient14283"
+ 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="#linearGradient63892"
+ id="linearGradient14285"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,-21)"
+ x1="52.17437"
+ y1="65.644958"
+ x2="50.371208"
+ y2="62.960247" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient18134"
+ id="radialGradient53141-7"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.684011,0.3442329,-1.2972142,1.1562236,739.67527,-1155.7895)"
+ cx="975.50568"
+ cy="690.68732"
+ fx="975.50568"
+ fy="690.68732"
+ r="2.333364" />
<mask
maskUnits="userSpaceOnUse"
- id="mask43822-1">
+ id="mask57450-1">
<rect
- y="208"
- x="754"
- height="9"
- width="12"
- id="rect43824-2"
- style="display:inline;overflow:visible;visibility:visible;opacity:0.93999993;fill:url(#linearGradient43826);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new" />
+ y="154.99899"
+ x="326.00305"
+ height="15"
+ width="15"
+ id="rect57452-3"
+ 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="#linearGradient37542"
- id="linearGradient14966"
+ xlink:href="#linearGradient23974"
+ id="linearGradient18738"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.888889,0,0,1,61.53822,346.48241)"
- x1="246.89435"
- y1="-4.4418921"
- x2="277.68143"
- y2="30.743095" />
+ gradientTransform="matrix(0.8008385,0,0,0.821004,429.95027,-161.55482)"
+ x1="108.71671"
+ y1="171.25618"
+ x2="105.85706"
+ y2="168.04703" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient20756"
+ id="linearGradient18740"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.8008385,0,0,0.8956408,540.31118,-183.20693)"
+ x1="-26.313976"
+ y1="178.07901"
+ x2="-28.432825"
+ y2="175.87964" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient319"
- id="linearGradient14968"
+ id="linearGradient18742"
gradientUnits="userSpaceOnUse"
- gradientTransform="translate(218.01612,129)"
- x1="87.03125"
- y1="241"
- x2="92.8125"
- y2="245.625" />
+ x1="510.29913"
+ y1="-20.435461"
+ x2="505.9494"
+ y2="-17.546936" />
+ <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" />
+ <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"
@@ -91718,6 +91860,331 @@
inkscape:transform-center-y="2"
inkscape:connector-curvature="0" />
</g>
+ <path
+ id="path39836-9"
+ style="display:inline;overflow:visible;visibility:visible;opacity:0.35;fill:none;stroke:url(#radialGradient23167-6);stroke-width:2.12000012;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+ d="m 456.1861,210.99286 c -2.96123,-0.16251 -3.0761,-7.48662 -5.17509,-7.48662"
+ sodipodi:nodetypes="cc"
+ inkscape:connector-curvature="0" />
+ <g
+ id="ICON_OUTLINER_OB_GREASEPENCIL"
+ transform="translate(0.39249986,-20.900649)"
+ inkscape:transform-center-x="3.3362538"
+ inkscape:transform-center-y="-0.19625023">
+ <g
+ id="ICON_GREASEPENCIL-8"
+ transform="translate(230.63274,419.89563)"
+ style="display:inline;enable-background:new">
+ <path
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccsccsc"
+ 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"
+ style="display:inline;overflow:visible;visibility:visible;fill:#ff921d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;marker:none;enable-background:accumulate"
+ id="path40242-2" />
+ <rect
+ style="display:inline;overflow:visible;visibility:visible;opacity:0.01000001;fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.80000001;marker:none;enable-background:new"
+ id="rect40244-9"
+ width="16"
+ height="16"
+ x="47"
+ y="31" />
+ <path
+ inkscape:connector-curvature="0"
+ id="path40246-1"
+ style="display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient14276);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;marker:none;enable-background:accumulate"
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list