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

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

@ -2,8 +2,6 @@ import bpy
from typing import Dict, Set from typing import Dict, Set
from .naming import ( from .naming import (
get_target_name, get_target_name,
get_basename,
get_name_with_asset_prefix,
task_layer_prefix_basename_get, task_layer_prefix_basename_get,
) )
from .util import get_storage_of_id from .util import get_storage_of_id

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

@ -13,7 +13,7 @@ from .transfer_data.transfer_util import transfer_data_add_entry
from .naming import ( from .naming import (
add_suffix_to_hierarchy, add_suffix_to_hierarchy,
remove_suffix_from_hierarchy, remove_suffix_from_hierarchy,
get_name_with_asset_prefix, asset_prefix_name_get,
get_id_type_name, get_id_type_name,
) )
@ -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 = get_name_with_asset_prefix(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

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

@ -116,9 +116,7 @@ def add_suffix_to_hierarchy(collection: bpy.types.Collection, suffix_base: str)
pass pass
# TODO Cleanup prefix doc strings def asset_prefix_name_get(name: str) -> str:
def get_name_with_asset_prefix(name: str) -> str:
"""Returns a string with the prefix if it is not already set.
Users can specify a prefix to live on all objects during the Users can specify a prefix to live on all objects during the
asset creation process. This prefix is stored in the scene. asset creation process. This prefix is stored in the scene.