From 0a1933344fbd32cfccebf429c8d83a9e73fd4c1f Mon Sep 17 00:00:00 2001 From: John Kiril Swenson Date: Tue, 22 Jul 2025 18:35:16 +0200 Subject: [PATCH] Move assets/icons to the main repository 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 --- release/datafiles/blender_icons_geom_update.py | 2 +- release/datafiles/icons_blend/toolbar.blend | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 release/datafiles/icons_blend/toolbar.blend diff --git a/release/datafiles/blender_icons_geom_update.py b/release/datafiles/blender_icons_geom_update.py index 75a79ae21e3..db21e54e6b9 100755 --- a/release/datafiles/blender_icons_geom_update.py +++ b/release/datafiles/blender_icons_geom_update.py @@ -59,7 +59,7 @@ def main() -> int: blender_bin = blender_app_path 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]]: diff --git a/release/datafiles/icons_blend/toolbar.blend b/release/datafiles/icons_blend/toolbar.blend new file mode 100644 index 00000000000..9ac838d971c --- /dev/null +++ b/release/datafiles/icons_blend/toolbar.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c40c877c54afd91d6fc4d5999d8d511eef69ed553c8d6a7fe9ac15a66ad7e4b3 +size 2666476