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

9
scripts-blender/addons/asset_pipeline_2/merge/core.py
View File

@ -187,7 +187,6 @@ def merge_task_layer(
return error_msg return error_msg
if len(map.conflict_ids) != 0: if len(map.conflict_ids) != 0:
for conflict_obj in map.conflict_ids: for conflict_obj in map.conflict_ids:
type_name = get_id_type_name(type(conflict_obj)) type_name = get_id_type_name(type(conflict_obj))
error_msg += ( error_msg += (
@ -198,9 +197,7 @@ def merge_task_layer(
# Remove all transfer data from target objects # Remove all transfer data from target objects
for source_obj in map.object_map: for source_obj in map.object_map:
if source_obj.data.users > 1: if source_obj.data.users > 1:
error_msg += ( error_msg += f"Object {source_obj.name} contains multi-user datablock'\n"
f"Object {source_obj.name} contains multi-user datablock'\n"
)
return error_msg return error_msg
target_obj = map.object_map[source_obj] target_obj = map.object_map[source_obj]
target_obj.transfer_data_ownership.clear() target_obj.transfer_data_ownership.clear()
@ -209,9 +206,7 @@ def merge_task_layer(
for source_obj in map.object_map: for source_obj in map.object_map:
if target_obj.data.users > 1: if target_obj.data.users > 1:
error_msg += ( error_msg += f"Object {source_obj.name} contains multi-user datablock'\n"
f"Object {source_obj.name} contains multi-user datablock'\n"
)
return error_msg return error_msg
target_obj = map.object_map[source_obj] target_obj = map.object_map[source_obj]
remap_user(source_obj, target_obj) remap_user(source_obj, target_obj)

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

@ -185,6 +185,7 @@ def apply_transfer_data(context: bpy.types.Context, transfer_data_map) -> None:
target_obj=target_obj, target_obj=target_obj,
) )
def data_type_from_transfer_data_key(obj: bpy.types.Object, td_type: str): def data_type_from_transfer_data_key(obj: bpy.types.Object, td_type: str):
"""Returns the data on an object that is referred to by the transfer data type""" """Returns the data on an object that is referred to by the transfer data type"""
if td_type == constants.VERTEX_GROUP_KEY: if td_type == constants.VERTEX_GROUP_KEY: