Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <julian@blender.org>2021-02-25 20:04:36 +0300
committerJulian Eisel <julian@blender.org>2021-02-25 20:09:00 +0300
commit57c41a9c633e4c48aff716d85a0977e4b39a8bdd (patch)
tree31a3c4ee32c5696708747a1ece5a821b35b82ff1
parent16504ed4a21d085b9b1a36360fce0f777beda039 (diff)
Icons: Add icon for the upcoming spreadsheet editor
The editor is being worked on by the geometry nodes team. Icon created by Andrzej Ambroz (jendrzych). Addresses https://developer.blender.org/T85925.
-rw-r--r--release/datafiles/blender_icons.svg16
-rw-r--r--release/datafiles/blender_icons16/icon16_spreadsheet.datbin0 -> 1048 bytes
-rw-r--r--release/datafiles/blender_icons32/icon32_spreadsheet.datbin0 -> 4120 bytes
-rw-r--r--source/blender/editors/datafiles/CMakeLists.txt1
-rw-r--r--source/blender/editors/include/UI_icons.h2
5 files changed, 18 insertions, 1 deletions
diff --git a/release/datafiles/blender_icons.svg b/release/datafiles/blender_icons.svg
index c2671666a47..f894ca3f298 100644
--- a/release/datafiles/blender_icons.svg
+++ b/release/datafiles/blender_icons.svg
@@ -17285,6 +17285,22 @@
id="g25682" />
</g>
</g>
+ <g
+ transform="translate(-1602.05,188)"
+ style="display:inline;enable-background:new"
+ id="g26614">
+ <path
+ style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.7;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
+ d="m 1796.5,348 a 0.50005,0.50005 0 0 0 -0.5,0.5 v 5.5 h 1 v -5 h 2 v -1 z m 7.5,0 v 1 h 7 v 5 h 1 v -5.5 a 0.50005,0.50005 0 0 0 -0.5,-0.5 z m -8,11 v 2.5 a 0.50005,0.50005 0 0 0 0.5,0.5 h 2.5 v -1 h -2 v -2 z m 15,0 v 2 h -7 v 1 h 7.5 a 0.50005,0.50005 0 0 0 0.5,-0.5 V 359 Z"
+ id="path33581"
+ inkscape:connector-curvature="0" />
+ <path
+ sodipodi:nodetypes="cccccccccc"
+ id="path33583"
+ style="display:inline;opacity:1;vector-effect:none;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:fill markers stroke;enable-background:new"
+ d="m 1800,348 h 3 v 14 h -3 z m -4,7 h 16 v 3 h -16 z"
+ inkscape:connector-curvature="0" />
+ </g>
</g>
<g
inkscape:groupmode="layer"
diff --git a/release/datafiles/blender_icons16/icon16_spreadsheet.dat b/release/datafiles/blender_icons16/icon16_spreadsheet.dat
new file mode 100644
index 00000000000..28f8f7b8f1e
--- /dev/null
+++ b/release/datafiles/blender_icons16/icon16_spreadsheet.dat
Binary files differ
diff --git a/release/datafiles/blender_icons32/icon32_spreadsheet.dat b/release/datafiles/blender_icons32/icon32_spreadsheet.dat
new file mode 100644
index 00000000000..ec9486929f4
--- /dev/null
+++ b/release/datafiles/blender_icons32/icon32_spreadsheet.dat
Binary files differ
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt
index 4c0d1b65465..beb22d43930 100644
--- a/source/blender/editors/datafiles/CMakeLists.txt
+++ b/source/blender/editors/datafiles/CMakeLists.txt
@@ -134,6 +134,7 @@ set(ICON_NAMES
info
sequence
text
+ spreadsheet
sound
action
nla
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index b7eb5cab7f9..f0a4b3c462e 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -173,7 +173,7 @@ DEF_ICON(IMAGE)
DEF_ICON(INFO)
DEF_ICON(SEQUENCE)
DEF_ICON_OBJECT_DATA(TEXT)
-DEF_ICON_BLANK(174)
+DEF_ICON(SPREADSHEET)
DEF_ICON(SOUND)
DEF_ICON(ACTION)
DEF_ICON(NLA)