Devel

CMake/Dependencies.cmake

@@ -160,21 +160,21 @@ if(OGRE_BUILD_DEPENDENCIES AND NOT EXISTS ${OGREDEPS_PATH})
 
       message(STATUS "Building Assimp")
       file(DOWNLOAD
-              https://github.com/assimp/assimp/archive/refs/tags/v5.4.0.tar.gz
-          ${PROJECT_BINARY_DIR}/v5.4.0.tar.gz)
+              https://github.com/assimp/assimp/archive/refs/tags/v5.4.2.tar.gz
+          ${PROJECT_BINARY_DIR}/v5.4.2.tar.gz)
       execute_process(COMMAND ${CMAKE_COMMAND}
-          -E tar xf v5.4.0.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
+          -E tar xf v5.4.2.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
       execute_process(COMMAND ${BUILD_COMMAND_COMMON}
           -DZLIB_ROOT=${OGREDEPS_PATH}
           -DBUILD_SHARED_LIBS=OFF
           -DASSIMP_BUILD_TESTS=OFF
           -DASSIMP_NO_EXPORT=TRUE
           -DASSIMP_BUILD_OGRE_IMPORTER=OFF
           -DASSIMP_BUILD_ASSIMP_TOOLS=OFF
-          ${PROJECT_BINARY_DIR}/assimp-5.4.0
-          WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/assimp-5.4.0)
+          ${PROJECT_BINARY_DIR}/assimp-5.4.2
+          WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/assimp-5.4.2)
       execute_process(COMMAND ${CMAKE_COMMAND}
-        --build ${PROJECT_BINARY_DIR}/assimp-5.4.0 ${BUILD_COMMAND_OPTS})
+        --build ${PROJECT_BINARY_DIR}/assimp-5.4.2 ${BUILD_COMMAND_OPTS})
     endif()
 
     message(STATUS "Building Bullet")

Components/Overlay/CMakeLists.txt

@@ -19,11 +19,11 @@ list(APPEND HEADER_FILES
 file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp")
 
 if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
-  set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.90.4" CACHE PATH "")
+  set(IMGUI_DIR "${PROJECT_BINARY_DIR}/imgui-1.90.9" CACHE PATH "")
   if(NOT EXISTS ${IMGUI_DIR})
     message(STATUS "Downloading imgui")
     file(DOWNLOAD
-        https://github.com/ocornut/imgui/archive/v1.90.4.tar.gz
+        https://github.com/ocornut/imgui/archive/v1.90.9.tar.gz
         ${PROJECT_BINARY_DIR}/imgui.tar.gz)
     execute_process(COMMAND ${CMAKE_COMMAND}
         -E tar xf imgui.tar.gz WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
@@ -76,7 +76,7 @@ if(OGRE_BUILD_COMPONENT_OVERLAY_IMGUI)
     set_source_files_properties(${IMGUI_DIR}/imgui_draw.cpp PROPERTIES
       COMPILE_FLAGS "-Wno-cast-qual")
     set_source_files_properties(${IMGUI_DIR}/imgui.cpp PROPERTIES
-      COMPILE_FLAGS "-Wno-cast-qual")
+      COMPILE_FLAGS "-Wno-cast-qual -Wno-unused-variable")
     if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
       set_property(SOURCE ${IMGUI_DIR}/misc/freetype/imgui_freetype.cpp
         APPEND PROPERTY COMPILE_OPTIONS "-Wno-unknown-warning-option")

OgreMain/src/OgreMeshSerializerImpl.cpp

@@ -2003,6 +2003,7 @@ namespace Ogre {
         size_t size = MSTREAM_OVERHEAD_SIZE;
         // float time
         size += sizeof(float);
+        size += sizeof(char); // bool includesNormals
         // float x,y,z[,nx,ny,nz]
         bool includesNormals = kf->getVertexBuffer()->getVertexSize() > (sizeof(float) * 3);
         size += sizeof(float) * (includesNormals ? 6 : 3) * vertexCount;