From cfe77fbafdde44fe76232026989b0d1d92a73fbf Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Thu, 11 Jul 2024 01:15:07 +0200 Subject: [PATCH] UI: Use Official Blender Logo As Blender Icon Our icon sources currently include two versions of the Blender logo, the official one and one that is modified to align better to our smallest pixel grid. But with our recent change to SVG icons, and alignment tweaks to the official version this can be used in all cases. This PR does so, removes BLENDER_LARGE, and also slightly tweaks FILE_BACKUP and FILE_BLEND to use the official form. Pull Request: https://projects.blender.org/blender/blender/pulls/124179 --- release/datafiles/icons_svg/blender.svg | 2 +- release/datafiles/icons_svg/blender_large.svg | 1 - release/datafiles/icons_svg/file_backup.svg | 2 +- release/datafiles/icons_svg/file_blend.svg | 2 +- source/blender/editors/datafiles/CMakeLists.txt | 1 - source/blender/editors/include/UI_icons.hh | 1 - source/blender/editors/space_file/filelist.cc | 2 +- 7 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 release/datafiles/icons_svg/blender_large.svg diff --git a/release/datafiles/icons_svg/blender.svg b/release/datafiles/icons_svg/blender.svg index abc54e8e3dc..48b6426e4af 100644 --- a/release/datafiles/icons_svg/blender.svg +++ b/release/datafiles/icons_svg/blender.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/release/datafiles/icons_svg/blender_large.svg b/release/datafiles/icons_svg/blender_large.svg deleted file mode 100644 index babbe386252..00000000000 --- a/release/datafiles/icons_svg/blender_large.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/release/datafiles/icons_svg/file_backup.svg b/release/datafiles/icons_svg/file_backup.svg index 14a4f0a5a4f..583a496b248 100644 --- a/release/datafiles/icons_svg/file_backup.svg +++ b/release/datafiles/icons_svg/file_backup.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/release/datafiles/icons_svg/file_blend.svg b/release/datafiles/icons_svg/file_blend.svg index a964e15d5c4..ceaeb40dddb 100644 --- a/release/datafiles/icons_svg/file_blend.svg +++ b/release/datafiles/icons_svg/file_blend.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 52f74d04cce..36ddb100bdf 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -268,7 +268,6 @@ if(WITH_BLENDER) back blank1 blender - blender_large blender_logo_large boids bold diff --git a/source/blender/editors/include/UI_icons.hh b/source/blender/editors/include/UI_icons.hh index a96ed2e1a07..a22a1dc3aef 100644 --- a/source/blender/editors/include/UI_icons.hh +++ b/source/blender/editors/include/UI_icons.hh @@ -791,7 +791,6 @@ DEF_ICON(VIEW_ZOOM) /* For larger use. Could be moved into main list. */ -DEF_ICON(BLENDER_LARGE) DEF_ICON(BLENDER_LOGO_LARGE) DEF_ICON(CANCEL_LARGE) DEF_ICON(DISC_LARGE) diff --git a/source/blender/editors/space_file/filelist.cc b/source/blender/editors/space_file/filelist.cc index 0536166614f..a68a4f0326c 100644 --- a/source/blender/editors/space_file/filelist.cc +++ b/source/blender/editors/space_file/filelist.cc @@ -1273,7 +1273,7 @@ static int filelist_geticon_ex(const FileList *filelist, } if (typeflag & FILE_TYPE_BLENDER) { - return (is_main || file->preview_icon_id) ? ICON_FILE_BLEND : ICON_BLENDER_LARGE; + return (is_main || file->preview_icon_id) ? ICON_FILE_BLEND : ICON_BLENDER; } if (typeflag & FILE_TYPE_BLENDER_BACKUP) { return ICON_FILE_BACKUP;