griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move assets/icons to the main repository

Browse Source 
Only the assets/publish folder was moved in #137219, which broke the
`make icons_geom` command for generating toolbar icons since the
submodule is now gone.

This patch moves the icons folder into a new
`release/datafiles/icons_blend` folder and updates
`blender_icons_geom_update.py` to fix the problem.

Pull Request: https://projects.blender.org/blender/blender/pulls/142639
This commit is contained in:
John Kiril Swenson
2025-07-22 18:35:16 +02:00
committed by John Kiril Swenson
parent b2140771ea
commit 0a1933344f
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/datafiles/blender_icons_geom_update.py
View File

@@ -59,7 +59,7 @@ def main() -> int:
blender_bin = blender_app_path blender_bin = blender_app_path
icons_blend = ( icons_blend = (
os.path.join(ROOTDIR, "release", "datafiles", "assets", "icons", "toolbar.blend"), os.path.join(ROOTDIR, "release", "datafiles", "icons_blend", "toolbar.blend"),
) )
def names_and_time_from_path(path: str) -> Iterator[tuple[str, float]]: def names_and_time_from_path(path: str) -> Iterator[tuple[str, float]]:

BIN
release/datafiles/icons_blend/toolbar.blend (Stored with Git LFS) Normal file
View File

Binary file not shown.