diff --git a/assets/blender/characters/CMakeLists.txt b/assets/blender/characters/CMakeLists.txt index 8a89fd0..9dfaa46 100644 --- a/assets/blender/characters/CMakeLists.txt +++ b/assets/blender/characters/CMakeLists.txt @@ -12,6 +12,7 @@ add_custom_command( DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/edited-normal-${EDITED_BLEND}.blend ${CMAKE_BINARY_DIR}/assets/blender/vrm-vroid-normal-${EDITED_BLEND}.blend ${CMAKE_CURRENT_SOURCE_DIR}/copy_animations.py + ${CMAKE_BINARY_DIR}/assets/blender/mixamo COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/edited-normal-${EDITED_BLEND}.blend ${CMAKE_CURRENT_BINARY_DIR}/edited-normal-${EDITED_BLEND}.blend @@ -24,6 +25,10 @@ add_custom_command( list(APPEND EDITED_BLEND_TARGETS ${CMAKE_BINARY_DIR}/assets/blender/characters/edited-normal-${EDITED_BLEND}.blend) list(APPEND CHARACTER_GLBS ${CMAKE_BINARY_DIR}/characters/${EDITED_BLEND}/normal-${EDITED_BLEND}.glb) endforeach() +add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/assets/blender/mixamo + COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/assets/blender/mixamo ${CMAKE_BINARY_DIR}/assets/blender/mixamo + DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/mixamo +) set(VRM_IMPORTED_BLENDS ${CMAKE_BINARY_DIR}/assets/blender/vrm-vroid-normal-female.blend @@ -117,7 +122,7 @@ function(blender_import_vrm BLEND VRM EDITABLE RIG) get_filename_component(VRM_NAME ${VRM} NAME_WE) add_custom_command(OUTPUT ${BLEND} COMMAND ${CMAKE_COMMAND} -E make_directory ${CREATE_DIRECTORIES} - COMMAND ${BLENDER} -b -Y -P ${CMAKE_SOURCE_DIR}/assets/blender/scripts/import_vrm2.py -- ${VRM_NAME}.vrm ${TARGET_NAME}.blend ${EDITABLE} ${RIG} + COMMAND ${BLENDER} -b -Y -P ${CMAKE_SOURCE_DIR}/assets/blender/scripts/import_vrm2.py -- ${VRM_NAME}.vrm ${BLEND} ${EDITABLE} ${RIG} COMMAND ${CMAKE_COMMAND} -D FILE=${BLEND} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/check_file_size.cmake COMMAND ${CMAKE_COMMAND} -E touch_nocreate ${BLEND} DEPENDS ${CMAKE_SOURCE_DIR}/assets/blender/scripts/import_vrm2.py diff --git a/assets/blender/scripts/export_models2.py b/assets/blender/scripts/export_models2.py index 29bd8d5..0555301 100644 --- a/assets/blender/scripts/export_models2.py +++ b/assets/blender/scripts/export_models2.py @@ -204,7 +204,7 @@ class CommandLineMapping: def __init__(self): self.objs = [mapping_armature_name] if len(mapping_objects) > 0: - self.objs += [o.otrip() for o in mapping_objects.split(";")] + self.objs += [o.strip() for o in mapping_objects.split(";")] self.files = [] for fobj in self.objs: self.files.append({"name": fobj}) diff --git a/assets/blender/scripts/import_vrm2.py b/assets/blender/scripts/import_vrm2.py index f1084f8..75a255e 100644 --- a/assets/blender/scripts/import_vrm2.py +++ b/assets/blender/scripts/import_vrm2.py @@ -207,5 +207,5 @@ main_armature.animation_data.action = default_action main_armature.select_set(False) bpy.context.view_layer.objects.active = None -bpy.ops.wm.save_as_mainfile(filepath=(basepath + "/assets/blender/" + imp.outfile)) +bpy.ops.wm.save_as_mainfile(filepath=(imp.outfile))