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

2
scripts-blender/addons/asset_pipeline_2/constants.py
View File

@ -12,7 +12,7 @@ TASK_LAYER_TYPES = {
}
# When creating a new asset, start in this task layer's file.
STARTING_FILE = 'MODEL'
STARTING_FILE = 'MOD'
# Convert it to the format that EnumProperty.items wants:
# List of 3-tuples, re-use name as description at 3rd element.

4
scripts-blender/addons/asset_pipeline_2/ops.py
View File

@ -90,7 +90,9 @@ class ASSETPIPE_OT_create_new_asset(bpy.types.Operator):
for task_layer_key in constants.TASK_LAYER_TYPES.keys():
if task_layer_key == "NONE":
continue
name = self._name + "." + task_layer_key + ".blend"
name = (
self._name + "." + constants.TASK_LAYER_TYPES[task_layer_key] + ".blend"
)
task_layer_file = os.path.join(asset_path, name)
asset_pipe.task_layer_name = task_layer_key
if task_layer_key == constants.STARTING_FILE: