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

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

@ -22,7 +22,6 @@ import bpy
from bpy_extras.id_map_utils import get_id_reference_map, get_all_referenced_ids from bpy_extras.id_map_utils import get_id_reference_map, get_all_referenced_ids
from .util import get_storage_of_id from .util import get_storage_of_id
from .. import constants, config from .. import constants, config
from .task_layer import get_default_task_layer
DELIMITER = "." DELIMITER = "."

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

@ -1,6 +1,6 @@
import bpy import bpy
from ..naming import get_basename from ..naming import get_basename
from ..task_layer import get_transfer_data_owner, get_local_task_layers from ..task_layer import get_transfer_data_owner
def check_transfer_data_entry( def check_transfer_data_entry(