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

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

@ -1,6 +1,5 @@
import bpy import bpy
from typing import Dict, Set from typing import Dict, Set
from . import core # TODO DEBUG WHY THIS DOESN'T WORK
from .naming import get_target_name, get_basename, get_name_with_asset_prefix from .naming import get_target_name, get_basename, get_name_with_asset_prefix
from .util import get_storage_of_id from .util import get_storage_of_id
from .transfer_data.transfer_util import transfer_data_add_entry from .transfer_data.transfer_util import transfer_data_add_entry

6
scripts-blender/addons/asset_pipeline_2/merge/transfer_data/transfer_functions.py
View File

@ -332,7 +332,7 @@ def init_material_slots(scene, obj):
matches = check_transfer_data_entry(transfer_data, name, type_key) matches = check_transfer_data_entry(transfer_data, name, type_key)
# Only add new ownership transfer_info if vertex group doesn't have an owner # Only add new ownership transfer_info if vertex group doesn't have an owner
if len(matches) == 0: if len(matches) == 0:
scene.asset_pipeline.add_temp_trasnfer_data( scene.asset_pipeline.add_temp_transfer_data(
name=name, name=name,
owner=task_layer_key, owner=task_layer_key,
type=type_key, type=type_key,
@ -578,7 +578,7 @@ def init_attributes(scene, obj):
# Only add new ownership transfer_info if vertex group doesn't have an owner # Only add new ownership transfer_info if vertex group doesn't have an owner
matches = check_transfer_data_entry(transfer_data, atttribute.name, type_key) matches = check_transfer_data_entry(transfer_data, atttribute.name, type_key)
if len(matches) == 0: if len(matches) == 0:
scene.asset_pipeline.add_temp_trasnfer_data( scene.asset_pipeline.add_temp_transfer_data(
name=atttribute.name, name=atttribute.name,
owner=task_layer_key, owner=task_layer_key,
type=type_key, type=type_key,
@ -648,7 +648,7 @@ def init_parent(scene, obj):
matches = check_transfer_data_entry(transfer_data, name, type_key) matches = check_transfer_data_entry(transfer_data, name, type_key)
# Only add new ownership transfer_info if vertex group doesn't have an owner # Only add new ownership transfer_info if vertex group doesn't have an owner
if len(matches) == 0: if len(matches) == 0:
scene.asset_pipeline.add_temp_trasnfer_data( scene.asset_pipeline.add_temp_transfer_data(
name=name, name=name,
owner=task_layer_key, owner=task_layer_key,
type=type_key, type=type_key,

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

@ -73,7 +73,7 @@ def transfer_info_init(scene, obj, list, type_key):
# Only add new ownership transfer_info if vertex group doesn't have an owner # Only add new ownership transfer_info if vertex group doesn't have an owner
matches = check_transfer_data_entry(transfer_data, item.name, type_key) matches = check_transfer_data_entry(transfer_data, item.name, type_key)
if len(matches) == 0: if len(matches) == 0:
scene.asset_pipeline.add_temp_trasnfer_data( scene.asset_pipeline.add_temp_transfer_data(
name=item.name, name=item.name,
owner=task_layer_key, owner=task_layer_key,
type=type_key, type=type_key,

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

@ -56,7 +56,7 @@ class AssetPipeline(bpy.types.PropertyGroup):
name="Task Layer Name", items=constants.TASK_LAYER_TYPES_ENUM_ITEMS name="Task Layer Name", items=constants.TASK_LAYER_TYPES_ENUM_ITEMS
) )
def add_temp_trasnfer_data(self, name, owner, type, obj): def add_temp_transfer_data(self, name, owner, type, obj):
new_transfer_data = self.temp_transfer_data new_transfer_data = self.temp_transfer_data
transfer_info = new_transfer_data.add() transfer_info = new_transfer_data.add()
transfer_info.name = name transfer_info.name = name