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 +7 -5
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dfa494a767 - Show all commits

2
scripts-blender/addons/asset_pipeline_2/__init__.py
View File

@ -6,7 +6,7 @@ bl_info = {
"name": "Asset Pipeline 2", "name": "Asset Pipeline 2",
"author": "Nick Alberelli", "author": "Nick Alberelli",
"description": "Blender Studio Asset Pipeline Add-on", "description": "Blender Studio Asset Pipeline Add-on",
"blender": (3, 1, 0), "blender": (4, 0, 0),
"version": (0, 1, 2), "version": (0, 1, 2),
"location": "View3D", "location": "View3D",
"warning": "", "warning": "",

10
scripts-blender/addons/asset_pipeline_2/merge/transfer_data/transfer_functions.py
View File

@ -587,12 +587,14 @@ def transfer_shape_key(
# ATTRIBUTE # ATTRIBUTE
def attributes_get_editable(attributes): def attributes_get_editable(attributes):
# TODO replace 'position' HACK with is_required once https://projects.blender.org/blender/blender/pulls/111468 is merged
return [ return [
item attribute
for item in attributes for attribute in attributes
if not ( if not (
item.is_internal or item.name == 'position' or item.name == 'material_index' attribute.is_internal
or attribute.is_required
# Material Index is part of material transfer and should be skipped
or attribute.name == 'material_index'
) )
] ]