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

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

@ -64,8 +64,15 @@ def ownership_get(
asset_pipe = scene.asset_pipeline asset_pipe = scene.asset_pipeline
asset_pipe.temp_transfer_data.clear() asset_pipe.temp_transfer_data.clear()
# TODO Figure out default in this case # TODO Figure out default in this case
default_task_layer = get_local_task_layers()[0] default_task_layer = get_local_task_layers()[0]
for col in asset_pipe.asset_collection.children:
if col.asset_id_owner == "NONE":
col.asset_id_owner = default_task_layer
task_layer_objs = get_task_layer_objects() task_layer_objs = get_task_layer_objects()
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
if obj.asset_id_owner == "NONE" and obj in task_layer_objs: if obj.asset_id_owner == "NONE" and obj in task_layer_objs:
@ -78,9 +85,6 @@ def ownership_get(
continue continue
ownership_transfer_data_cleanup(obj) ownership_transfer_data_cleanup(obj)
init_transfer_data(scene, obj) init_transfer_data(scene, obj)
for col in asset_pipe.asset_collection.children:
if col.asset_id_owner == "NONE":
col.asset_id_owner = default_task_layer
def ownership_set(temp_transfer_data: bpy.types.CollectionProperty) -> None: def ownership_set(temp_transfer_data: bpy.types.CollectionProperty) -> None: