[Bf-blender-cvs] [173f90c700b] blender2.8: Revert "Grease-Pencil: Icons"
Dalai Felinto
noreply at git.blender.org
Tue Jan 23 15:01:43 CET 2018
Commit: 173f90c700bb7b0f0b5e4a373ea2d5c259dc2289
Author: Dalai Felinto
Date: Tue Jan 23 10:41:25 2018 -0200
Branches: blender2.8
https://developer.blender.org/rB173f90c700bb7b0f0b5e4a373ea2d5c259dc2289
Revert "Grease-Pencil: Icons"
This reverts commits:
* f0ef3603862 Grease-Pencil: Icons from the grease pencil branch
* 13bf4b3804b Grease-Pencil: Fixup for icons
* fb8c382fa17 Grease Pencil dat files fix
===================================================================
M release/datafiles/blender_icons.svg
D release/datafiles/blender_icons16/icon16_gpencil_stroke_paint.dat
D release/datafiles/blender_icons16/icon16_object_origin.dat
D release/datafiles/blender_icons16/icon16_outliner_data_gpencil.dat
D release/datafiles/blender_icons16/icon16_outliner_ob_gpencil.dat
D release/datafiles/blender_icons32/icon32_gpencil_stroke_paint.dat
D release/datafiles/blender_icons32/icon32_object_origin.dat
D release/datafiles/blender_icons32/icon32_outliner_data_gpencil.dat
D release/datafiles/blender_icons32/icon32_outliner_ob_gpencil.dat
M source/blender/editors/include/UI_icons.h
===================================================================
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index 3e0b2ecaf4d..e939758e816 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -26,51 +26,6 @@
id="title49470">Blender icons v. 2.5.08</title>
<defs
id="defs4">
- <linearGradient
- id="linearGradient18969">
- <stop
- id="stop18967"
- offset="0"
- style="stop-color:#b45d00;stop-opacity:1;" />
- <stop
- style="stop-color:#ff982a;stop-opacity:1;"
- offset="0.3167825"
- id="stop18965" />
- <stop
- id="stop18963"
- offset="1"
- style="stop-color:#ffb36b;stop-opacity:1" />
- </linearGradient>
- <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="linearGradient18895">
- <stop
- id="stop18893"
- offset="0"
- style="stop-color:#ffedd5;stop-opacity:1;" />
- <stop
- style="stop-color:#ff982a;stop-opacity:1;"
- offset="0.6832175"
- id="stop18891" />
- <stop
- id="stop18889"
- offset="1"
- style="stop-color:#b45d00;stop-opacity:1;" />
- </linearGradient>
<linearGradient
id="linearGradient31767"
inkscape:collect="always">
@@ -31391,14 +31346,13 @@
x1="189.76083"
y1="248.13905"
x2="116.05637"
- y2="183.6826"
- gradientTransform="translate(335.99871,21.048284)" />
+ y2="183.6826" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient22562"
id="radialGradient23167-6"
gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.5950386,-0.0747115,0.06947956,0.55336879,432.31142,44.44399)"
+ gradientTransform="matrix(0.99220964,-0.12457927,0.11585516,0.92272644,-34.13325,22.766225)"
cx="-0.78262758"
cy="294.63174"
fx="-0.78262758"
@@ -31584,9 +31538,9 @@
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
- gridtolerance="10"
- guidetolerance="10"
- objecttolerance="10"
+ gridtolerance="10000"
+ guidetolerance="10000"
+ objecttolerance="10000"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="2.499733"
@@ -31696,7 +31650,7 @@
inkscape:groupmode="layer"
id="layer5"
inkscape:label="grid"
- style="display:inline;opacity:0.3"
+ style="opacity:0.3;display:inline"
sodipodi:insensitive="true">
<g
id="g40174"
@@ -31704,7 +31658,7 @@
<g
id="g22995">
<rect
- style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;enable-background:accumulate"
+ style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect22955"
width="1"
height="7"
@@ -31720,9 +31674,9 @@
height="7"
width="1"
id="rect22957"
- style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;enable-background:accumulate" />
+ style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
- style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;enable-background:accumulate"
+ style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect22959"
width="1"
height="7"
@@ -31738,9 +31692,9 @@
height="7"
width="1"
id="rect22961"
- style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;enable-background:accumulate" />
+ style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
- style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;enable-background:accumulate"
+ style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect22963"
width="1"
height="7"
@@ -31756,9 +31710,9 @@
height="7"
width="1"
id="rect22965"
- style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;enable-background:accumulate" />
+ style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
- style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;enable-background:accumulate"
+ style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect22967"
width="1"
height="7"
@@ -31774,9 +31728,9 @@
height="7"
width="1"
id="rect22969"
- style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;enable-background:accumulate" />
+ style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
- style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;enable-background:accumulate"
+ style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect22971"
width="1"
height="7"
@@ -31792,9 +31746,9 @@
height="7"
width="1"
id="rect22973"
- style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;enable-background:accumulate" />
+ style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
- style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;enable-background:accumulate"
+ style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect22975"
width="1"
height="7"
@@ -31810,9 +31764,9 @@
height="7"
width="1"
id="rect22977"
- style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;enable-background:accumulate" />
+ style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
- style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;enable-background:accumulate"
+ style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect22979"
width="1"
height="7"
@@ -31828,9 +31782,9 @@
height="7"
width="1"
id="rect22981"
- style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;enable-background:accumulate" />
+ style="opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.70000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<rect
- style="display:inline;overflow:visible;visibility:visible;opacity:0.9;fill:#000000;fill-opacity:1;fill-rule:nonzero;st
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list