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

4
scripts-blender/addons/asset_pipeline_2/merge/transfer_data/transfer_core.py
View File

@ -40,7 +40,7 @@ def transfer_data_clean(obj):
transfer_functions.vertex_groups_clean(obj) transfer_functions.vertex_groups_clean(obj)
transfer_functions.modifiers_clean(obj) transfer_functions.modifiers_clean(obj)
transfer_functions.constraints_clean(obj) transfer_functions.constraints_clean(obj)
transfer_functions.material_slots_clean(obj) # transfer_functions.material_slots_clean(obj)
transfer_functions.shape_keys_clean(obj) transfer_functions.shape_keys_clean(obj)
transfer_functions.attribute_clean(obj) transfer_functions.attribute_clean(obj)
transfer_functions.parent_clean(obj) transfer_functions.parent_clean(obj)
@ -58,7 +58,7 @@ def transfer_data_is_missing(transfer_data_item) -> bool:
return bool( return bool(
transfer_functions.vertex_group_is_missing(transfer_data_item) transfer_functions.vertex_group_is_missing(transfer_data_item)
or transfer_functions.modifier_is_missing(transfer_data_item) or transfer_functions.modifier_is_missing(transfer_data_item)
or transfer_functions.material_slots_is_missing(transfer_data_item) # or transfer_functions.material_slots_is_missing(transfer_data_item)
or transfer_functions.constraint_is_missing(transfer_data_item) or transfer_functions.constraint_is_missing(transfer_data_item)
or transfer_functions.shape_key_is_missing(transfer_data_item) or transfer_functions.shape_key_is_missing(transfer_data_item)
or transfer_functions.attribute_is_missing(transfer_data_item) or transfer_functions.attribute_is_missing(transfer_data_item)

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

@ -291,8 +291,19 @@ def init_material_slots(scene, obj, use_default_owner: bool):
name = constants.MATERIAL_TRANSFER_DATA_ITEM_NAME name = constants.MATERIAL_TRANSFER_DATA_ITEM_NAME
transfer_data = obj.transfer_data_ownership transfer_data = obj.transfer_data_ownership
material_objects = [
'ARMATURE',
'CURVE',
'GPENCIL',
'META',
'MESH',
'SURFACE',
'FONT',
'VOLUME',
]
# Only Execute if Material Slots exist on object # Only Execute if Material Slots exist on object
if len(obj.material_slots) == 0: if obj.type not in material_objects:
return return
matches = check_transfer_data_entry(transfer_data, name, td_type_key) matches = check_transfer_data_entry(transfer_data, name, td_type_key)
# Only add new ownership transfer_data_item if vertex group doesn't have an owner # Only add new ownership transfer_data_item if vertex group doesn't have an owner