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

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

@ -48,6 +48,7 @@ def ownership_get(
in the merge process in the merge process
""" """
task_layer_key = scene.asset_pipeline.task_layer_name task_layer_key = scene.asset_pipeline.task_layer_name
task_layer_col_name = get_task_layer_col_name(task_layer_key)
scene.asset_pipeline.temp_transfer_data.clear() 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:
@ -83,6 +84,7 @@ def get_invalid_objects(
# TODO Add Docstring # TODO Add Docstring
# TODO Make common function to get task layer col via task layer name # TODO Make common function to get task layer col via task layer name
task_layer_key = scene.asset_pipeline.task_layer_name task_layer_key = scene.asset_pipeline.task_layer_name
task_layer_col_name = get_task_layer_col_name(task_layer_key)
task_layer_col = local_col.children.get(task_layer_col_name) task_layer_col = local_col.children.get(task_layer_col_name)
invalid_obj = [] invalid_obj = []
@ -97,6 +99,14 @@ def get_invalid_objects(
return invalid_obj return invalid_obj
def get_task_layer_col_name(task_layer_key):
# TODO Docstring and return types
asset_pipe = bpy.context.scene.asset_pipeline
task_layer_name = get_dict_tuple_item(constants.TASK_LAYER_TYPES, task_layer_key)[1]
prefix = asset_pipe.prefix + "." if asset_pipe.prefix != "" else ""
return prefix + task_layer_name
def remap_user(source_datablock: bpy.data, target_datablock: bpy.data) -> None: def remap_user(source_datablock: bpy.data, target_datablock: bpy.data) -> None:
"""Remap datablock and append name to datablock that has been remapped """Remap datablock and append name to datablock that has been remapped