Commit: 88833170f221b164f0d5c5edacf112d8769730b9 Author: Harley Acheson Date: Fri Nov 1 09:02:50 2019 -0700 Branches: master https://developer.blender.org/rB88833170f221b164f0d5c5edacf112d8769730b9
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/addons M source/blender/editors/include/UI_icons.h M source/blender/editors/space_file/filelist.c =================================================================== diff --git a/release/scripts/addons b/release/scripts/addons index acfe2a22e07..854b986732d 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit acfe2a22e07046564cc5788388c2404486c76fe9 +Subproject commit 854b986732d643e696973175e480c15594bc4780 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, _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
