Cleanup: Synchronizing Icons #114874

Harley Acheson · 2023-11-14T23:23:53+01:00

Harley Acheson commented

2023-11-14 23:23:53 +01:00

Mostly just the result of running blender_icons_update.py without adding or changing any icon source files. Removal of three unused icons and adding three others to the project to resolve conflicts between them.

The three icons removed (icon_lightprobe_cubemap, icon_lightprobe_planar, icon_lightprobe_grid) are in CMakeLists.txt but are not defined as icons or used. The three icons added to the project (icon_lightprobe_plane, icon_lightprobe_sphere, icon_lightprobe_volume.dat) are created in the file system by blender_icons_update.py but not added to the project. These icons are used.

Best guess is that icon_lightprobe_plane, for example, is meant to replace icon_lightprobe_planar but the old one was not removed and the new one not added to the project.

Mostly just the result of running `blender_icons_update.py` without adding or changing any icon source files. Removal of three unused icons and adding three others to the project to resolve conflicts between them. --- The three icons removed (icon_lightprobe_cubemap, icon_lightprobe_planar, icon_lightprobe_grid) are in CMakeLists.txt but are not defined as icons or used. The three icons added to the project (icon_lightprobe_plane, icon_lightprobe_sphere, icon_lightprobe_volume.dat) are created in the file system by blender_icons_update.py but not added to the project. These icons are used. Best guess is that icon_lightprobe_plane, for example, is meant to replace icon_lightprobe_planar but the old one was not removed and the new one not added to the project.

Harley Acheson added 1 commit 2023-11-14 23:24:07 +01:00

56a4385b80 Cleanup: Synchronizing Icons

Mostly just the result of running `blender_icons_update.py` without adding or changing any icon source files. Removal of three unused icons and adding three others to the project to resolve conflicts between them.

---

The three icons removed (icon_lightprobe_cubemap, icon_lightprobe_planar, icon_lightprobe_grid) are in CMakeLists.txt but are not defined as icons or used. The three icons added to the project (icon_lightprobe_plane, icon_lightprobe_sphere, icon_lightprobe_volume.dat) are created in the file system by blender_icons_update.py but not added to the project. These icons are used.

Best guess is that icon_lightprobe_plane, for example, is meant to replace icon_lightprobe_planar but the old one was not removed and the new one not added to the project.

Harley Acheson added this to the User Interface project 2023-11-14 23:24:23 +01:00

Harley Acheson requested review from Julian Eisel 2023-11-14 23:24:52 +01:00

Harley Acheson commented

2023-11-14 23:27:16 +01:00

@JulianEisel

In a nutshell simply running blender_icons_update.py results in almost every single icon dat file changing. And three are in conflict because it looks like they were replaced with ones with different names but without replacing the old ones or adding the new ones to git.

I've seen these get out of sync before but never this bad.

@JulianEisel In a nutshell simply running `blender_icons_update.py` results in almost every single icon dat file changing. And three are in conflict because it looks like they were replaced with ones with different names but without replacing the old ones or adding the new ones to git. I've seen these get out of sync before but never this bad.

Harley Acheson added 1 commit 2023-11-15 18:46:02 +01:00

6c0b22b0ae Merge branch 'main' of projects.blender.org:blender/blender into IconFix

Harley Acheson commented

2023-11-15 18:58:43 +01:00

Confirmed that running blender_icons_update.py after this makes no changes. Build fine.

Confirmed that running `blender_icons_update.py` after this makes no changes. Build fine.

Harley Acheson merged commit 06404082b5 into main

2023-11-15 18:59:27 +01:00

Harley Acheson referenced this issue from a commit

2023-11-15 18:59:29 +01:00

Cleanup: Synchronizing Icons

Harley Acheson deleted branch IconFix