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

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

@ -134,10 +134,6 @@ def merge_task_layer(
for source_obj in map.object_map: for source_obj in map.object_map:
target_obj = map.object_map[source_obj] target_obj = map.object_map[source_obj]
# TODO Figure out why this doesn't work on Push only Pull currently
# transfer_core.copy_transfer_data(
# target_obj.transfer_data_ownership, source_obj.transfer_data_ownership
# )
remap_user(source_obj, target_obj) remap_user(source_obj, target_obj)
transfer_core.transfer_data_clean(target_obj) transfer_core.transfer_data_clean(target_obj)

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

@ -25,7 +25,6 @@ def copy_transfer_data_ownership(
def transfer_data_clean(obj): def transfer_data_clean(obj):
# TODO add each type of transfer data here
transfer_functions.vertex_groups_clean(obj) transfer_functions.vertex_groups_clean(obj)
transfer_functions.vertex_colors_clean(obj) transfer_functions.vertex_colors_clean(obj)
transfer_functions.uv_layer_clean(obj) transfer_functions.uv_layer_clean(obj)
@ -181,14 +180,3 @@ def transfer_data_add_entry(
transfer_info.owner = task_layer_name.upper() transfer_info.owner = task_layer_name.upper()
transfer_info.type = td_type transfer_info.type = td_type
return transfer_info return transfer_info
def copy_transfer_data(source_data, target_data):
source_data.clear()
for transfer_info in target_data:
transfer_data_add_entry(
transfer_data=source_data,
name=transfer_info.name,
task_layer_name=transfer_info.owner,
td_type=transfer_info.type,
)