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:
authorHarley Acheson <harley.acheson@gmail.com>2019-11-01 19:02:50 +0300
committerHarley Acheson <harley.acheson@gmail.com>2019-11-01 19:02:50 +0300
commit88833170f221b164f0d5c5edacf112d8769730b9 (patch)
tree86dfde6c48d0a144d1d70a6fde395a52c0f77051
parentf5b09ae034233471e239c964b193a0c4aeadc960 (diff)
UI: Disk to Disc Spelling Change
Identifiers for icons representing optical drives should use 'disc', not 'disk'. Differential Revision: https://developer.blender.org/D6166 Reviewed by Julian Eisel
m---------release/scripts/addons0
-rw-r--r--source/blender/editors/include/UI_icons.h2
-rw-r--r--source/blender/editors/space_file/filelist.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/release/scripts/addons b/release/scripts/addons
-Subproject acfe2a22e07046564cc5788388c2404486c76fe
+Subproject 854b986732d643e696973175e480c15594bc478
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index d6a1d7f193c..c15f299bca8 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -857,7 +857,7 @@ DEF_ICON(SCRIPTPLUGINS)
DEF_ICON_BLANK(855)
DEF_ICON_BLANK(856)
DEF_ICON_BLANK(857)
-DEF_ICON(DISK)
+DEF_ICON(DISC)
DEF_ICON(DESKTOP)
DEF_ICON(EXTERNAL_DRIVE)
DEF_ICON(NETWORK_DRIVE)
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index e61375b2d4c..1ea7d81f9da 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -338,7 +338,7 @@ enum {
enum {
SPECIAL_IMG_DOCUMENT = 0,
- SPECIAL_IMG_DRIVE_DISK = 1,
+ SPECIAL_IMG_DRIVE_DISC = 1,
SPECIAL_IMG_FOLDER = 2,
SPECIAL_IMG_PARENT = 3,
SPECIAL_IMG_DRIVE_FIXED = 4,