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
1 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 f4c0c96b9f - Show all commits

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

@ -81,7 +81,7 @@ def ownership_get(
# 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
obj.name = asset_prefix_name_get(obj.name) # obj.name = asset_prefix_name_get(obj.name)
init_transfer_data_with_defaults(scene, obj) init_transfer_data_with_defaults(scene, obj)
continue continue
# Skip items that have no owner # Skip items that have no owner