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

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

@ -52,6 +52,7 @@ def ownership_get(
task_layer_col_name = get_dict_tuple_item( task_layer_col_name = get_dict_tuple_item(
constants.TASK_LAYER_TYPES, task_layer_name constants.TASK_LAYER_TYPES, task_layer_name
)[1] )[1]
scene.asset_pipeline.temp_transfer_data.clear()
task_layer_col = local_col.children.get(task_layer_col_name) task_layer_col = local_col.children.get(task_layer_col_name)
for obj in local_col.all_objects: for obj in local_col.all_objects:
# Mark Asset ID Owner for objects in the current task layers collection # Mark Asset ID Owner for objects in the current task layers collection

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

@ -62,7 +62,6 @@ def init_transfer_data(
task_layer_name (str): Name of task layer task_layer_name (str): Name of task layer
temp_transfer_data: Item of class ASSET_TRANSFER_DATA_TEMP temp_transfer_data: Item of class ASSET_TRANSFER_DATA_TEMP
""" """
scene.asset_pipeline.temp_transfer_data.clear()
transfer_functions.init_vertex_groups(scene, obj) transfer_functions.init_vertex_groups(scene, obj)
transfer_functions.init_material_slots(scene, obj) transfer_functions.init_material_slots(scene, obj)
transfer_functions.init_modifiers(scene, obj) transfer_functions.init_modifiers(scene, obj)