From 4d47125ea916864836ab299a4f8379ee3943e698 Mon Sep 17 00:00:00 2001 From: Sergey Lapin Date: Tue, 3 Feb 2026 08:03:26 +0300 Subject: [PATCH] Fix addon --- CMakeLists.txt | 2 +- assets/blender/scripts/addons/3.6/blender2ogre.zip | 3 --- assets/blender/scripts/addons/3.6/io_ogre.zip | 3 +++ assets/blender/scripts/install_addons.py | 2 +- src/physics/CMakeLists.txt | 2 ++ 5 files changed, 7 insertions(+), 5 deletions(-) delete mode 100644 assets/blender/scripts/addons/3.6/blender2ogre.zip create mode 100644 assets/blender/scripts/addons/3.6/io_ogre.zip diff --git a/CMakeLists.txt b/CMakeLists.txt index 54a0732..73a440f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -258,7 +258,7 @@ add_custom_target(stage_files ALL DEPENDS ${CMAKE_BINARY_DIR}/resources.cfg ${MA add_custom_target(remove_scenes COMMAND rm -f ${VRM_SOURCE} ${VRM_IMPORTED_BLENDS} ${CHARACTER_GLBS}) -target_compile_definitions(Game PRIVATE FLECS_CPP_NO_AUTO_REGISTRATION) +target_compile_definitions(Game PRIVATE FLECS_CPP_NO_AUTO_REGISTRATION JPH_PROFILE_ENABLED) install(TARGETS Game DESTINATION bin) install(TARGETS Editor DESTINATION bin) diff --git a/assets/blender/scripts/addons/3.6/blender2ogre.zip b/assets/blender/scripts/addons/3.6/blender2ogre.zip deleted file mode 100644 index 7e4908a..0000000 --- a/assets/blender/scripts/addons/3.6/blender2ogre.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:97986de2bf789298208853b2abf5a8565c7a31a3d58a489dee817e886d50c569 -size 6695313 diff --git a/assets/blender/scripts/addons/3.6/io_ogre.zip b/assets/blender/scripts/addons/3.6/io_ogre.zip new file mode 100644 index 0000000..719fa0d --- /dev/null +++ b/assets/blender/scripts/addons/3.6/io_ogre.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b27cb68a387dcd9f2b7d2ea01ce5a9887c2a6badd86e71b7d7438134b3c30377 +size 218297 diff --git a/assets/blender/scripts/install_addons.py b/assets/blender/scripts/install_addons.py index 52eea29..8491b42 100644 --- a/assets/blender/scripts/install_addons.py +++ b/assets/blender/scripts/install_addons.py @@ -6,7 +6,7 @@ script_list = [item for item in file_list if item.endswith('.zip')] for file in file_list: path_to_file = os.path.join(path_to_script_dir, file) bpy.ops.preferences.addon_install(overwrite=True, target='DEFAULT', filepath=path_to_file, filter_folder=True, filter_python=False, filter_glob="*.py;*.zip") -enableTheseAddons = ["VRM_Addon_for_Blender-release", "blender2ogre"] +enableTheseAddons = ["VRM_Addon_for_Blender-release", "io_ogre"] for string in enableTheseAddons: name = enableTheseAddons bpy.ops.preferences.addon_enable(module = string) diff --git a/src/physics/CMakeLists.txt b/src/physics/CMakeLists.txt index 63561a3..4d89d71 100644 --- a/src/physics/CMakeLists.txt +++ b/src/physics/CMakeLists.txt @@ -16,3 +16,5 @@ find_package(flecs REQUIRED CONFIG) add_library(physics STATIC physics.cpp) target_link_libraries(physics PUBLIC OgreMain Jolt::Jolt) target_include_directories(physics PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_compile_definitions(physics PRIVATE JPH_PROFILE_ENABLED) +