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

4
scripts-blender/addons/asset_pipeline_2/transfer_functions.py
View File

@ -92,7 +92,7 @@ def transfer_material_slot(item, obj_target):
# Delete existing material slot if exists # Delete existing material slot if exists
for idx in range(len(obj_source.material_slots)): for idx in range(len(obj_source.material_slots)):
slot = obj_source.material_slots[idx] slot = obj_source.material_slots[idx]
if asset_suffix.get_asset_basename(slot.material.name) == item.name: if asset_suffix.get_basename(slot.material.name) == item.name:
obj_target.active_material_index = idx obj_target.active_material_index = idx
bpy.ops.object.material_slot_remove({"object": obj_target}) bpy.ops.object.material_slot_remove({"object": obj_target})
@ -101,7 +101,7 @@ def transfer_material_slot(item, obj_target):
for idx in range(len(obj_source.material_slots)): for idx in range(len(obj_source.material_slots)):
if idx >= len(obj_target.material_slots): if idx >= len(obj_target.material_slots):
slot = obj_source.material_slots[idx] slot = obj_source.material_slots[idx]
if asset_suffix.get_asset_basename(slot.material.name) == item.name: if asset_suffix.get_basename(slot.material.name) == item.name:
bpy.ops.object.material_slot_add({"object": obj_target}) bpy.ops.object.material_slot_add({"object": obj_target})
obj_target.material_slots[idx].link = obj_source.material_slots[ obj_target.material_slots[idx].link = obj_source.material_slots[
idx idx

6
scripts-blender/addons/asset_pipeline_2/transferable_data.py
View File

@ -21,9 +21,9 @@ def apply_transfer_data(
): ):
for item in transfer_data_list: for item in transfer_data_list:
for target_obj in target_col.objects: for target_obj in target_col.objects:
if asset_suffix.get_asset_basename( if asset_suffix.get_basename(target_obj.name) == asset_suffix.get_basename(
target_obj.name item.id.name
) == asset_suffix.get_asset_basename(item.id.name): ):
if item.type == "VERTEX_GROUP": if item.type == "VERTEX_GROUP":
transfer_functions.transfer_vertex_group( transfer_functions.transfer_vertex_group(
context=context, context=context,