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

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

@ -1,4 +1,5 @@
import bpy import bpy
from ..merge.naming import task_layer_prefix_transfer_data_update
from .asset_mapping import AssetTransferMapping from .asset_mapping import AssetTransferMapping
from .transfer_data.transfer_core import ( from .transfer_data.transfer_core import (
init_transfer_data, init_transfer_data,
@ -74,6 +75,9 @@ def ownership_get(
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:
for transfer_data_item in obj.transfer_data_ownership:
task_layer_prefix_transfer_data_update(transfer_data_item)
# 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:
obj.asset_id_owner = default_task_layer obj.asset_id_owner = default_task_layer