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

18
scripts-blender/addons/asset_pipeline_2/transfer_data/transfer_core.py
View File

@ -27,7 +27,7 @@ def copy_transfer_data_ownership(
def transfer_data_clean(obj): def transfer_data_clean(obj):
transfer_functions.vertex_groups_clean(obj) transfer_functions.vertex_groups_clean(obj)
transfer_functions.vertex_colors_clean(obj) transfer_functions.vertex_colors_clean(obj)
transfer_functions.uv_layer_clean(obj) # transfer_functions.uv_layer_clean(obj)
transfer_functions.modifiers_clean(obj) transfer_functions.modifiers_clean(obj)
transfer_functions.constraints_clean(obj) transfer_functions.constraints_clean(obj)
transfer_functions.material_slot_clean(obj) transfer_functions.material_slot_clean(obj)
@ -49,7 +49,7 @@ def transfer_data_is_missing(transfer_data_item) -> bool:
or transfer_functions.modifier_is_missing(transfer_data_item) or transfer_functions.modifier_is_missing(transfer_data_item)
or transfer_functions.material_slot_is_missing(transfer_data_item) or transfer_functions.material_slot_is_missing(transfer_data_item)
or transfer_functions.constraint_is_missing(transfer_data_item) or transfer_functions.constraint_is_missing(transfer_data_item)
or transfer_functions.uv_layer_is_missing(transfer_data_item) # or transfer_functions.uv_layer_is_missing(transfer_data_item)
or transfer_functions.shape_key_is_missing(transfer_data_item) or transfer_functions.shape_key_is_missing(transfer_data_item)
or transfer_functions.attribute_is_missing(transfer_data_item) or transfer_functions.attribute_is_missing(transfer_data_item)
) )
@ -71,7 +71,7 @@ def init_transfer_data(
transfer_functions.init_modifiers(scene, obj) transfer_functions.init_modifiers(scene, obj)
transfer_functions.init_constraints(scene, obj) transfer_functions.init_constraints(scene, obj)
transfer_functions.init_vertex_colors(scene, obj) transfer_functions.init_vertex_colors(scene, obj)
transfer_functions.init_uv_layers(scene, obj) # transfer_functions.init_uv_layers(scene, obj)
transfer_functions.init_shap_keys(scene, obj) transfer_functions.init_shap_keys(scene, obj)
transfer_functions.init_attributes(scene, obj) transfer_functions.init_attributes(scene, obj)
@ -132,12 +132,12 @@ def apply_transfer_data(context: bpy.types.Context, transfer_data_map) -> None:
target_obj=target_obj, target_obj=target_obj,
source_obj=source_obj, source_obj=source_obj,
) )
if transfer_info.type == constants.UV_LAYERS_KEY: # if transfer_info.type == constants.UV_LAYERS_KEY:
transfer_functions.transfer_uv_layer( # transfer_functions.transfer_uv_layer(
target_obj=target_obj, # target_obj=target_obj,
source_obj=source_obj, # source_obj=source_obj,
uv_name=transfer_info.name, # uv_name=transfer_info.name,
) # )
if transfer_info.type == constants.SHAPE_KEY_KEY: if transfer_info.type == constants.SHAPE_KEY_KEY:
transfer_functions.transfer_shape_key( transfer_functions.transfer_shape_key(
context=context, context=context,