From e143d5aea1be482dc2e62005e49974264f53d5b9 Mon Sep 17 00:00:00 2001 From: Lucas Alber Date: Wed, 7 Aug 2024 18:06:41 +0200 Subject: [PATCH] Revert "build: Revert ImGUI update (workaround ocornut/imgui#7868" This reverts commit 47c442ea8169d60741b85b72cc9f8032f29af837. --- meson.build | 2 +- subprojects/imgui.wrap | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 0b4f16a..503f77a 100644 --- a/meson.build +++ b/meson.build @@ -51,7 +51,7 @@ glfw = dependency('glfw3', version: ['>=3.4.0'], fallback: ['glfw', 'glfw_dep']) glm = dependency('glm', fallback : ['glm', 'glm_dep'], version: ['>=0.9.9.8']) tol = dependency('tinyobjloader', fallback : ['tinyobjloader', 'tinyobjloader_dep']) tgltf = dependency('tinygltf', required: get_option('tinygltf'), fallback: ['tinygltf', 'tinygltf_dep']) -imgui = dependency('imgui', version: ['>=1.90'], fallback: ['imgui', 'imgui_dep']) +imgui = dependency('imgui', version: ['>=1.90.9'], fallback: ['imgui', 'imgui_dep']) nlohmann_json = dependency('nlohmann_json', version: ['>=3.11.3'], fallback: ['nlohmann_json', 'nlohmann_json_dep']) vma = dependency('VulkanMemoryAllocator', version: ['>=3.1.0'], fallback: ['VulkanMemoryAllocator', 'VulkanMemoryAllocator_dep']) stb = dependency('stb', fallback: ['stb', 'stb_dep'], default_options : ['stb_libraries=[\'stb_image\', \'stb_image_write\']']) diff --git a/subprojects/imgui.wrap b/subprojects/imgui.wrap index 286129d..01e935b 100644 --- a/subprojects/imgui.wrap +++ b/subprojects/imgui.wrap @@ -2,7 +2,7 @@ directory = imgui url = https://github.com/ocornut/imgui -revision = v1.90.8 +revision = v1.90.9 depth = 1 patch_directory = imgui