studio/blender-studio-tools
13
32
Fork 19
Code Issues 22 Pull Requests 4 Projects Releases 1 Activity

Asset Pipeline v2 #145

Closed
Nick Alberelli wants to merge 431 commits from (deleted):feature/asset-pipeline-v2 into main
pull from: (deleted):feature/asset-pipeline-v2
merge into: studio:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 26 Commits 431 Files Changed 70 +8 -1
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fbb2aec937 - Show all commits

1
.gitattributes vendored
View File

@ -3,3 +3,4 @@
*.jpg filter=lfs diff=lfs merge=lfs -text *.jpg filter=lfs diff=lfs merge=lfs -text
*.whl filter=lfs diff=lfs merge=lfs -text *.whl filter=lfs diff=lfs merge=lfs -text
*.gif filter=lfs diff=lfs merge=lfs -text *.gif filter=lfs diff=lfs merge=lfs -text
*.blend filter=lfs diff=lfs merge=lfs -text

3
.gitignore vendored
View File

@ -68,3 +68,6 @@ ENV/
# Docs # Docs
node_modules/ node_modules/
docs/.vitepress/cache docs/.vitepress/cache
# Temp
*.blend1

3
scripts-blender/addons/asset_pipeline_2/task_layer_merge_test.blend Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:cb034f7920e413371c56f11d73735f36cf7c2c1302e6696b46b701b9dbde4b31
size 891200