studio/blender-studio-tools
13
30
Fork 19
Code Issues 20 Pull Requests 3 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 +1 -4
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e5aebf294d - Show all commits

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

@ -648,11 +648,9 @@ def attributes_get_editable(attributes):
for attribute in attributes for attribute in attributes
if not ( if not (
attribute.is_internal attribute.is_internal
# or attribute.is_required or attribute.is_required
# Material Index is part of material transfer and should be skipped # Material Index is part of material transfer and should be skipped
or attribute.name == 'material_index' or attribute.name == 'material_index'
or attribute.name
== 'position' # TODO replace position with is_required in 4.0
) )
] ]
@ -784,5 +782,4 @@ def init_parent(scene, obj, use_default_owner: bool):
def transfer_parent(target_obj, source_obj): def transfer_parent(target_obj, source_obj):
target_obj.parent = source_obj.parent target_obj.parent = source_obj.parent
# TODO Test if this works in all cases
target_obj.matrix_parent_inverse = source_obj.parent.matrix_world.inverted() target_obj.matrix_parent_inverse = source_obj.parent.matrix_world.inverted()