Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

blender: fixes broken assets #53833

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

CaioFrancisco
Copy link

Testing the changes

  • I tested the changes in this PR: YES

Local build testing

  • I built this PR locally for my native architecture, x86_64-glibc

What? Huh? Why?

Fixes #53648.

it's 4:30AM, i'm probably gonna type something close to what i typed in the comments.

The Blender repository recently shuffled a few features around internally, and put the new brushes (and possibly more tools) in a submodule pointing to the blender-assets repository. Unfortunately, this repository also has heavy usage of the Git LFS system, and because of go-gitea/gitea#4773, we can no longer just download the archive of the repository and extract it into the proper place in this particular scenario. The solution I implemented was just git cloning the blender-assets repository into the right place, settings up LFS and then pulling the LFS files. Luckily enough, blender-assets tags mirror Blender's own version releases, so we can just use Blender's version to find the right blender-assets tag.

@sgn
Copy link
Member

sgn commented Jan 4, 2025

Can you try our blender with assets from their prebuilt binaries?

https://download.blender.org/release/Blender4.3/

They provides:

blender-4.3.2-linux-x64/4.3/python/lib/python3.11/site-packages/charset_normalizer/assets/
blender-4.3.2-linux-x64/4.3/python/lib/python3.11/site-packages/charset_normalizer/assets/__pycache__/
blender-4.3.2-linux-x64/4.3/python/lib/python3.11/site-packages/charset_normalizer/assets/__pycache__/__init__.cpython-311.pyc
blender-4.3.2-linux-x64/4.3/python/lib/python3.11/site-packages/charset_normalizer/assets/__init__.py
blender-4.3.2-linux-x64/4.3/scripts/startup/bl_operators/assets.py
blender-4.3.2-linux-x64/4.3/scripts/startup/bl_operators/__pycache__/assets.cpython-311.pyc
blender-4.3.2-linux-x64/4.3/datafiles/assets/
blender-4.3.2-linux-x64/4.3/datafiles/assets/LICENSE
blender-4.3.2-linux-x64/4.3/datafiles/assets/geometry_nodes/
blender-4.3.2-linux-x64/4.3/datafiles/assets/geometry_nodes/procedural_hair_node_assets.blend
blender-4.3.2-linux-x64/4.3/datafiles/assets/geometry_nodes/smooth_by_angle.blend
blender-4.3.2-linux-x64/4.3/datafiles/assets/brushes/
blender-4.3.2-linux-x64/4.3/datafiles/assets/brushes/essentials_brushes-gp_vertex.blend
blender-4.3.2-linux-x64/4.3/datafiles/assets/brushes/essentials_brushes-curve_sculpt.blend
blender-4.3.2-linux-x64/4.3/datafiles/assets/brushes/essentials_brushes-gp_sculpt.blend
blender-4.3.2-linux-x64/4.3/datafiles/assets/brushes/essentials_brushes-mesh_weight.blend
blender-4.3.2-linux-x64/4.3/datafiles/assets/brushes/essentials_brushes-mesh_texture.blend
blender-4.3.2-linux-x64/4.3/datafiles/assets/brushes/essentials_brushes-mesh_vertex.blend
blender-4.3.2-linux-x64/4.3/datafiles/assets/brushes/essentials_brushes-gp_weight.blend
blender-4.3.2-linux-x64/4.3/datafiles/assets/brushes/essentials_brushes-gp_draw.blend
blender-4.3.2-linux-x64/4.3/datafiles/assets/brushes/essentials_brushes-mesh_sculpt.blend
blender-4.3.2-linux-x64/4.3/datafiles/assets/blender_assets.cats.txt

If that works, it would be better than fetching with git and git-lfs

@CaioFrancisco
Copy link
Author

it feels hackier to extract them from the binaries themselves just so we can build the binaries again, but sure.

@CaioFrancisco
Copy link
Author

CaioFrancisco commented Jan 5, 2025

@sgn i wasn't able to get nor xrscextract nor xrsccopy to behave (even after your latest commit), so i'm giving up on implementing your suggestion, sorry.

also, quoting myself from the issue,

oreo mentioned in the IRC that he contacted with Blender's very own Sebastian Parborg and Sebastian said this is gonna get fixed in the next release

so this might not even be necessary at all. you may close this PR if you don't think it's worth it to keep my git workaround up until what could be just a few weeks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

blender: missing assets folder from upstream (sculpting broken, geometry nodes broken)
2 participants