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

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

@ -35,9 +35,9 @@ def transfer_data_is_missing(transfer_data_item) -> bool:
""" """
return bool( return bool(
transfer_functions.vertex_group_is_missing(transfer_data_item) transfer_functions.vertex_group_is_missing(transfer_data_item)
or transfer_functions.modifiers_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.constraints_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)
) )
@ -85,7 +85,7 @@ def apply_transfer_data(context: bpy.types.Context, transfer_data_map) -> None:
obj_source=item.id_data, obj_source=item.id_data,
) )
if item.type == constants.VERTEX_COLOR_KEY: if item.type == constants.VERTEX_COLOR_KEY:
transfer_functions.transfer_vertex_colors( transfer_functions.transfer_vertex_color(
vertex_color_name=item.name, vertex_color_name=item.name,
obj_target=target_obj, obj_target=target_obj,
obj_source=item.id_data, obj_source=item.id_data,

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

@ -85,7 +85,7 @@ def get_vertex_colors(obj, task_layer_name, new_transfer_data):
item.obj = obj item.obj = obj
def transfer_vertex_colors( def transfer_vertex_color(
vertex_color_name: str, vertex_color_name: str,
obj_target: bpy.types.Object, obj_target: bpy.types.Object,
obj_source: bpy.types.Object, obj_source: bpy.types.Object,
@ -156,7 +156,7 @@ def transfer_uv_layer(obj_source, obj_target, uv_name):
# MODIFIERS # MODIFIERS
def modifiers_is_missing(item): def modifier_is_missing(item):
obj = item.id_data obj = item.id_data
if item.type == constants.MODIFIER_KEY and not obj.modifiers.get(item["name"]): if item.type == constants.MODIFIER_KEY and not obj.modifiers.get(item["name"]):
return True return True
@ -234,7 +234,7 @@ def transfer_modifier(item, obj_target):
# CONSTRAINTS # CONSTRAINTS
def constraints_is_missing(item): def constraint_is_missing(item):
obj = item.id_data obj = item.id_data
if item.type == constants.CONSTRAINT_KEY and not obj.constraints.get(item["name"]): if item.type == constants.CONSTRAINT_KEY and not obj.constraints.get(item["name"]):
return True return True