Skip to content

Commit

Permalink
Revert "build: Revert ImGUI update (workaround ocornut/imgui#7868"
Browse files Browse the repository at this point in the history
This reverts commit 47c442e.
  • Loading branch information
LDAP committed Aug 7, 2024
1 parent 47c442e commit e143d5a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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\']'])
Expand Down
2 changes: 1 addition & 1 deletion subprojects/imgui.wrap
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e143d5a

Please sign in to comment.