Commit: 01b929345bc922f348cd40abc77d06fbcb0094a3
Author: Antonio Vazquez
Date: Tue Jun 13 18:02:29 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB01b929345bc922f348cd40abc77d06fbcb0094a3
Move OB_GPENCIL icon to new position
The new icon used a postion used by new icons in master, so need to be moved.
===================================================================
M release/datafiles/blender_icons.svg
===================================================================
diff --git a/release/datafiles/blender_icons.svg
b/release/datafiles/blender_icons.svg
index 1f2e95e75d3..86513336820 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -31499,14 +31499,14 @@
objecttolerance="10000"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="19.997864"
- inkscape:cx="462.52244"
- inkscape:cy="435.14241"
+ inkscape:zoom="1.7675782"
+ inkscape:cx="272.31188"
+ inkscape:cy="131.10994"
inkscape:document-units="px"
inkscape:current-layer="g23149-4"
showgrid="true"
- inkscape:window-width="1920"
- inkscape:window-height="1025"
+ inkscape:window-width="1680"
+ inkscape:window-height="987"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:snap-nodes="true"
@@ -93142,7 +93142,7 @@
sodipodi:start="6.1086524"
sodipodi:end="7.5049158"
sodipodi:open="true"
- d="m 45.185432,872.62412 c 0.358149,2.03116 -0.793733,4.02628
-2.731847,4.73169" />
+ d="m 45.185432,872.62412 a 4.2499995,4.2499995 0 0 1
-2.731847,4.73169" />
<path
style="fill:none;stroke:#4b2f1e;stroke-width:2.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path1376"
@@ -93154,9 +93154,9 @@
sodipodi:start="4.4505896"
sodipodi:end="4.9741884"
sodipodi:open="true"
- d="m 39.188267,866.60064 c 1.186888,-0.31802 2.436579,-0.31802
3.623467,0" />
+ d="m 39.188267,866.60064 a 7,7 0 0 1 3.623467,0" />
<path
- d="m 47.76148,875.17385 c -0.318025,1.18689 -0.942871,2.26916
-1.811733,3.13802"
+ d="m 47.76148,875.17385 a 6.9999995,6.9999995 0 0 1
-1.811733,3.13802"
sodipodi:open="true"
sodipodi:end="0.78539816"
sodipodi:start="0.26179939"
@@ -93168,7 +93168,7 @@
id="path1378"
style="fill:none;stroke:#4b2f1e;stroke-width:2.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
/>
<path
- d="m 39.546414,877.35581 c -1.938113,-0.70541
-3.089995,-2.70053 -2.731846,-4.73169"
+ d="m 39.546414,877.35581 a 4.2499995,4.2499995 0 0 1
-2.731846,-4.73169"
sodipodi:open="true"
sodipodi:end="3.3161256"
sodipodi:start="1.9198622"
@@ -93190,7 +93190,7 @@
sodipodi:start="2.3561945"
sodipodi:end="2.8797933"
sodipodi:open="true"
- d="m 36.050253,878.31187 c -0.868862,-0.86886
-1.493708,-1.95113 -1.811733,-3.13802" />
+ d="M 36.050253,878.31187 A 6.9999995,6.9999995 0 0 1
34.23852,875.17385" />
<rect
ry="2.75"
rx="2.75"
@@ -93238,9 +93238,9 @@
sodipodi:start="1.9198622"
sodipodi:end="3.3161256"
sodipodi:open="true"
- d="m 39.546414,877.35581 c -1.938113,-0.70541
-3.089995,-2.70053 -2.731846,-4.73169" />
+ d="m 39.546414,877.35581 a 4.2499995,4.2499995 0 0 1
-2.731846,-4.73169" />
<path
- d="m 36.050253,878.31187 c -0.868862,-0.86886
-1.493708,-1.95113 -1.811733,-3.13802"
+ d="M 36.050253,878.31187 A 6.9999995,6.9999995 0 0 1
34.23852,875.17385"
sodipodi:open="true"
sodipodi:end="2.8797933"
sodipodi:start="2.3561945"
@@ -93252,7 +93252,7 @@
id="path1394"
style="fill:none;stroke:#ffb36b;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
/>
<path
- d="m 38.875,877.04273 c -0.321653,-0.18571 -0.617575,-0.41278
-0.880204,-0.6754"
+ d="m 38.875,877.04273 a 4.2499995,4.2499995 0 0 1
-0.880204,-0.6754"
sodipodi:open="true"
sodipodi:end="2.3561945"
sodipodi:start="2.0943951"
@@ -93274,7 +93274,7 @@
sodipodi:start="2.3561945"
sodipodi:end="2.6179939"
sodipodi:open="true"
- d="m 36.050253,878.31187 c -0.432565,-0.43257
-0.806561,-0.91997 -1.11243,-1.44975" />
+ d="m 36.050253,878.31187 a 6.9999995,6.9999995 0 0 1
-1.11243,-1.44975" />
<path
style="fill:none;stroke:#4b2f1e;stroke-width:2.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path1400"
@@ -93286,12 +93286,12 @@
sodipodi:start="0.87266463"
sodipodi:end="2.268928"
sodipodi:open="true"
- d="m -38.268152,-870.10643 c -1.579966,1.32575 -3.88373,1.32575
-5.463696,0"
+ d="m -38.268152,-870.10643 a 4.2500005,4.2500005 0 0 1
-5.463696,0"
inkscape:transform-center-x="-2.2499995"
inkscape:transform-center-y="-2.25"
transform="scale(-1,-1)" />
<path
- d="m -38.268152,-870.10643 c -1.579966,1.32575 -3.88373,1.32575
-5.463696,0"
+ d="m -38.268152,-870.10643 a 4.2500005,4.2500005 0 0 1
-5.463696,0"
sodipodi:open="true"
sodipodi:end="2.268928"
sodipodi:start="0.87266463"
@@ -93316,7 +93316,7 @@
sodipodi:start="1.3089969"
sodipodi:end="1.8325957"
sodipodi:open="true"
- d="m -39.188266,-866.60064 c -1.186888,0.31803
-2.436579,0.31803 -3.623467,0"
+ d="m -39.188266,-866.60064 a 7.0000005,7.0000005 0 0 1
-3.623467,0"
inkscape:transform-center-y="-3.7500001"
transform="scale(-1,-1)"
inkscape:transform-center-x="-3.7499995" />
@@ -93331,9 +93331,9 @@
sodipodi:start="4.0142573"
sodipodi:end="4.9741884"
sodipodi:open="true"
- d="m 38.268153,870.10643 c 1.062216,-0.8913 2.492452,-1.20838
3.831828,-0.84949" />
+ d="m 38.268153,870.10643 a 4.25,4.25 0 0 1 3.831828,-0.84949" />
<path
- d="m 39.188267,866.60064 c 1.186888,-0.31802 2.436579,-0.31802
3.623467,0"
+ d="m 39.188267,866.60064 a 7,7 0 0 1 3.623467,0"
sodipodi:open="true"
sodipodi:end="4.9741884"
sodipodi:start="4.4505896"
@@ -93355,9 +93355,9 @@
sodipodi:start="4.4505896"
sodipodi:end="4.712389"
sodipodi:open="true"
- d="M 39.188267,866.60064 C 39.779161,866.44231
40.388261,866.36212 41,866.36212" />
+ d="M 39.188267,866.60064 A 6.9999995,6.9999995 0 0 1
41,866.36212" />
<path
- d="m 38.268153,870.10643 c 0.475408,-0.39891 1.032412,-0.68887
1.631866,-0.84949"
+ d="m 38.268153,870.10643 a 4.25,4.25 0 0 1 1.631866,-0.84949"
sodipodi:open="true"
sodipodi:end="4.4505896"
sodipodi:start="4.0142573"
@@ -93379,9 +93379,9 @@
sodipodi:ry="7"
sodipodi:start="0.26179939"
sodipodi:end="0.78539816"
- d="m 47.761481,875.17385 c -0.318026,1.18689 -0.942871,2.26916
-1.811734,3.13802" />
+ d="m 47.761481,875.17385 a 7,7 0 0 1 -1.811734,3.13802" />
<path
- d="m 45.185432,872.62412 c 0.358149,2.03116 -0.793733,4.02628
-2.731847,4.73169"
+ d="m 45.185432,872.62412 a 4.2499995,4.2499995 0 0 1
-2.731847,4.73169"
sodipodi:end="7.5049158"
sodipodi:start="6.1086524"
sodipodi:ry="4.2499995"
@@ -93493,8 +93493,7 @@
inkscape:export-filename="C:\Documents and
Settings\Tata\Pulpit\Kopia blender\.blender\icons\blender's iconset.png"
id="circle63689"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#422200;stroke-width:1.97436094;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
- transform="matrix(0.6425292,0,0,0.642531,44.523834,146.81699)"
- d="m 140,118 c 0,4.41828 -3.58172,8 -8,8 -4.41828,0
-8,-3.58172 -8,-8 0,-4.41828 3.58172,-8 8,-8 4.41828,0 8,3.58172 8,8 z" />
+
transform="matrix(0.6425292,0,0,0.642531,44.523834,146.81699)" />
<circle
sodipodi:ry="8"
sodipodi:rx="8"
@@ -93508,8 +93507,7 @@
inkscape:export-filename="C:\Documents and
Settings\Tata\Pulpit\Kopia blender\.blender\icons\blender's iconset.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
-
transform="matrix(-0.5858806,-0.06590218,0.06677852,-0.5812167,198.80048,299.96262)"
- d="m 140,118 c 0,4.41828 -3.58172,8 -8,8 -4.41828,0
-8,-3.58172 -8,-8 0,-4.41828 3.58172,-8 8,-8 4.41828,0 8,3.58172 8,8 z" />
+
transform="matrix(-0.5858806,-0.06590218,0.06677852,-0.5812167,198.80048,299.96262)"
/>
<circle
sodipodi:ry="8"
sodipodi:rx="8"
@@ -93523,8 +93521,288 @@
id="circle63693"
inkscape:export-filename="C:\Documents and
Settings\Tata\Pulpit\Kopia blender\.blender\icons\blender's iconset.png"
inkscape:export-xdpi="90"
- inkscape:export-ydpi="90"
- d="m 140,118 c 0,4.41828 -3.58172,8 -8,8 -4.41828,0
-8,-3.58172 -8,-8 0,-4.41828 3.58172,-8 8,-8 4.41828,0 8,3.58172 8,8 z" />
+ inkscape:export-ydpi="90" />
+ </g>
+ </g>
+ <g
+ transform="matrix(1.6674711,0,0,1.6674711,-685.09804,-51.602542)"
+ style="display:inline;enable-background:new"
+ id="g17
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
