From 02bb0b21445f52f7ffeec237ffc4ed585fbbebd0 Mon Sep 17 00:00:00 2001 From: William Roy Date: Sun, 29 Dec 2024 13:04:43 -0500 Subject: [PATCH] Bump version to 1.91.6 --- libimgui-docking/manifest | 2 +- libimgui-examples-docking/manifest | 2 +- libimgui-examples/manifest | 2 +- libimgui-null-backend-test-docking/manifest | 2 +- libimgui-null-backend-test/manifest | 2 +- libimgui-platform-glfw-docking/manifest | 2 +- libimgui-platform-glfw/manifest | 2 +- libimgui-platform-osx-docking/manifest | 2 +- libimgui-platform-osx/manifest | 2 +- libimgui-platform-win32-docking/manifest | 2 +- libimgui-platform-win32/manifest | 2 +- libimgui-render-dx10-docking/manifest | 2 +- libimgui-render-dx10/manifest | 2 +- libimgui-render-dx11-docking/manifest | 2 +- libimgui-render-dx11/manifest | 2 +- libimgui-render-dx12-docking/manifest | 2 +- libimgui-render-dx12/manifest | 2 +- libimgui-render-dx9-docking/manifest | 2 +- libimgui-render-dx9/manifest | 2 +- libimgui-render-metal-docking/manifest | 2 +- libimgui-render-metal/manifest | 2 +- libimgui-render-opengl2-docking/manifest | 2 +- libimgui-render-opengl2/manifest | 2 +- libimgui-render-opengl3-docking/manifest | 2 +- libimgui-render-opengl3/manifest | 2 +- libimgui-render-vulkan-docking/manifest | 2 +- libimgui-render-vulkan/manifest | 2 +- libimgui/imgui/imconfig.h | 7 +++++-- libimgui/manifest | 2 +- upstream | 2 +- upstream-docking | 2 +- 31 files changed, 35 insertions(+), 32 deletions(-) diff --git a/libimgui-docking/manifest b/libimgui-docking/manifest index 3e479d8..dac3f23 100644 --- a/libimgui-docking/manifest +++ b/libimgui-docking/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-docking -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui: Bloat-free Graphical User interface for C++ with minimal dependencies ; docking branch license: MIT diff --git a/libimgui-examples-docking/manifest b/libimgui-examples-docking/manifest index 9d2a346..9bc67c4 100644 --- a/libimgui-examples-docking/manifest +++ b/libimgui-examples-docking/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-examples-docking -version: 1.91.4 +version: 1.91.6 project: imgui summary: Executable examples of usage of the Dear ImGui library ; docking branch license: MIT diff --git a/libimgui-examples/manifest b/libimgui-examples/manifest index 258a6a1..2e43936 100644 --- a/libimgui-examples/manifest +++ b/libimgui-examples/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-examples -version: 1.91.4 +version: 1.91.6 project: imgui summary: Executable examples of usage of the Dear ImGui library license: MIT diff --git a/libimgui-null-backend-test-docking/manifest b/libimgui-null-backend-test-docking/manifest index 6182f12..85a988e 100644 --- a/libimgui-null-backend-test-docking/manifest +++ b/libimgui-null-backend-test-docking/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-null-backend-test-docking -version: 1.91.4 +version: 1.91.6 project: imgui summary: Package using Dear ImGui's example_null backend to test libimgui ; docking branch license: MIT diff --git a/libimgui-null-backend-test/manifest b/libimgui-null-backend-test/manifest index 8a6c091..fc1229b 100644 --- a/libimgui-null-backend-test/manifest +++ b/libimgui-null-backend-test/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-null-backend-test -version: 1.91.4 +version: 1.91.6 project: imgui summary: Package using Dear ImGui's example_null backend to test libimgui. license: MIT diff --git a/libimgui-platform-glfw-docking/manifest b/libimgui-platform-glfw-docking/manifest index 1d60b7b..8bd0b04 100644 --- a/libimgui-platform-glfw-docking/manifest +++ b/libimgui-platform-glfw-docking/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-platform-glfw-docking -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui platform backend for GLFW ; docking branch license: MIT diff --git a/libimgui-platform-glfw/manifest b/libimgui-platform-glfw/manifest index 4b7475a..8b54316 100644 --- a/libimgui-platform-glfw/manifest +++ b/libimgui-platform-glfw/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-platform-glfw -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui platform backend for GLFW license: MIT diff --git a/libimgui-platform-osx-docking/manifest b/libimgui-platform-osx-docking/manifest index c463c9c..d2a220a 100644 --- a/libimgui-platform-osx-docking/manifest +++ b/libimgui-platform-osx-docking/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-platform-osx-docking -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui platform backend for OSX ; docking branch license: MIT diff --git a/libimgui-platform-osx/manifest b/libimgui-platform-osx/manifest index abec192..348ab66 100644 --- a/libimgui-platform-osx/manifest +++ b/libimgui-platform-osx/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-platform-osx -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui platform backend for OSX license: MIT diff --git a/libimgui-platform-win32-docking/manifest b/libimgui-platform-win32-docking/manifest index af92571..3ef23f9 100644 --- a/libimgui-platform-win32-docking/manifest +++ b/libimgui-platform-win32-docking/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-platform-win32-docking -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui platform backend for Win32 ; docking branch license: MIT diff --git a/libimgui-platform-win32/manifest b/libimgui-platform-win32/manifest index 83b2ad8..538e06f 100644 --- a/libimgui-platform-win32/manifest +++ b/libimgui-platform-win32/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-platform-win32 -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui platform backend for Win32 license: MIT diff --git a/libimgui-render-dx10-docking/manifest b/libimgui-render-dx10-docking/manifest index 97f6966..9c8ab7e 100644 --- a/libimgui-render-dx10-docking/manifest +++ b/libimgui-render-dx10-docking/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-dx10-docking -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for DirectX 10 ; docking branch license: MIT diff --git a/libimgui-render-dx10/manifest b/libimgui-render-dx10/manifest index 52f64ea..2eea411 100644 --- a/libimgui-render-dx10/manifest +++ b/libimgui-render-dx10/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-dx10 -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for DirectX 10 license: MIT diff --git a/libimgui-render-dx11-docking/manifest b/libimgui-render-dx11-docking/manifest index a616541..22a1dfd 100644 --- a/libimgui-render-dx11-docking/manifest +++ b/libimgui-render-dx11-docking/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-dx11-docking -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for DirectX 11 ; docking branch license: MIT diff --git a/libimgui-render-dx11/manifest b/libimgui-render-dx11/manifest index 665c3db..fe422b5 100644 --- a/libimgui-render-dx11/manifest +++ b/libimgui-render-dx11/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-dx11 -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for DirectX 11 license: MIT diff --git a/libimgui-render-dx12-docking/manifest b/libimgui-render-dx12-docking/manifest index 8ba6688..966bd4f 100644 --- a/libimgui-render-dx12-docking/manifest +++ b/libimgui-render-dx12-docking/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-dx12-docking -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for DirectX 12 ; docking branch license: MIT diff --git a/libimgui-render-dx12/manifest b/libimgui-render-dx12/manifest index 36e68de..fd2b869 100644 --- a/libimgui-render-dx12/manifest +++ b/libimgui-render-dx12/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-dx12 -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for DirectX 12 license: MIT diff --git a/libimgui-render-dx9-docking/manifest b/libimgui-render-dx9-docking/manifest index c11dea7..fb49057 100644 --- a/libimgui-render-dx9-docking/manifest +++ b/libimgui-render-dx9-docking/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-dx9-docking -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for DirectX 9 ; docking branch license: MIT diff --git a/libimgui-render-dx9/manifest b/libimgui-render-dx9/manifest index 5cba08d..5567bdb 100644 --- a/libimgui-render-dx9/manifest +++ b/libimgui-render-dx9/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-dx9 -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for DirectX 9 license: MIT diff --git a/libimgui-render-metal-docking/manifest b/libimgui-render-metal-docking/manifest index fa25a32..ce0ce2a 100644 --- a/libimgui-render-metal-docking/manifest +++ b/libimgui-render-metal-docking/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-metal-docking -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for Metal ; docking branch license: MIT diff --git a/libimgui-render-metal/manifest b/libimgui-render-metal/manifest index 6ea4094..cf4b407 100644 --- a/libimgui-render-metal/manifest +++ b/libimgui-render-metal/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-metal -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for Metal license: MIT diff --git a/libimgui-render-opengl2-docking/manifest b/libimgui-render-opengl2-docking/manifest index e1f195d..ddf6146 100644 --- a/libimgui-render-opengl2-docking/manifest +++ b/libimgui-render-opengl2-docking/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-opengl2-docking -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for Open GL 2 ; docking branch license: MIT diff --git a/libimgui-render-opengl2/manifest b/libimgui-render-opengl2/manifest index 0cb9e03..ca52fd4 100644 --- a/libimgui-render-opengl2/manifest +++ b/libimgui-render-opengl2/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-opengl2 -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for Open GL 2 license: MIT diff --git a/libimgui-render-opengl3-docking/manifest b/libimgui-render-opengl3-docking/manifest index d58f68b..983e90b 100644 --- a/libimgui-render-opengl3-docking/manifest +++ b/libimgui-render-opengl3-docking/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-opengl3-docking -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for OpenGL 3 ; docking branch license: MIT diff --git a/libimgui-render-opengl3/manifest b/libimgui-render-opengl3/manifest index af4362d..6139f39 100644 --- a/libimgui-render-opengl3/manifest +++ b/libimgui-render-opengl3/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-opengl3 -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for OpenGL 3 license: MIT diff --git a/libimgui-render-vulkan-docking/manifest b/libimgui-render-vulkan-docking/manifest index 532a36f..dd376f7 100644 --- a/libimgui-render-vulkan-docking/manifest +++ b/libimgui-render-vulkan-docking/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-vulkan-docking -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for Vulkan ; docking branch license: MIT diff --git a/libimgui-render-vulkan/manifest b/libimgui-render-vulkan/manifest index 8039510..8435c56 100644 --- a/libimgui-render-vulkan/manifest +++ b/libimgui-render-vulkan/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui-render-vulkan -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui render backend for Vulkan license: MIT diff --git a/libimgui/imgui/imconfig.h b/libimgui/imgui/imconfig.h index b023eb2..f18fe61 100644 --- a/libimgui/imgui/imconfig.h +++ b/libimgui/imgui/imconfig.h @@ -44,7 +44,6 @@ //---- Don't define obsolete functions/enums/behaviors. Consider enabling from time to time after updating to clean your code of obsolete function/names. //#define IMGUI_DISABLE_OBSOLETE_FUNCTIONS -//#define IMGUI_DISABLE_OBSOLETE_KEYIO // 1.87+ disable legacy io.KeyMap[]+io.KeysDown[] in favor io.AddKeyEvent(). This is automatically done by IMGUI_DISABLE_OBSOLETE_FUNCTIONS. //---- Disable all of Dear ImGui or don't implement standard windows/tools. // It is very strongly recommended to NOT disable the demo windows and debug tool during development. They are extremely useful in day to day work. Please read comments in imgui_demo.cpp. @@ -64,6 +63,7 @@ //#define IMGUI_DISABLE_FILE_FUNCTIONS // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle at all (replace them with dummies) //#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle so you can implement them yourself if you don't want to link with fopen/fclose/fread/fwrite. This will also disable the LogToTTY() function. //#define IMGUI_DISABLE_DEFAULT_ALLOCATORS // Don't implement default allocators calling malloc()/free() to avoid linking with them. You will need to call ImGui::SetAllocatorFunctions(). +//#define IMGUI_DISABLE_DEFAULT_FONT // Disable default embedded font (ProggyClean.ttf), remove ~9.5 KB from output binary. AddFontDefault() will assert. //#define IMGUI_DISABLE_SSE // Disable use of SSE intrinsics even if available //---- Enable Test Engine / Automation features. @@ -74,9 +74,12 @@ //#define IMGUI_INCLUDE_IMGUI_USER_H //#define IMGUI_USER_H_FILENAME "my_folder/my_imgui_user.h" -//---- Pack colors to BGRA8 instead of RGBA8 (to avoid converting from one to another) +//---- Pack vertex colors as BGRA8 instead of RGBA8 (to avoid converting from one to another). Need dedicated backend support. //#define IMGUI_USE_BGRA_PACKED_COLOR +//---- Use legacy CRC32-adler tables (used before 1.91.6), in order to preserve old .ini data that you cannot afford to invalidate. +//#define IMGUI_USE_LEGACY_CRC32_ADLER + //---- Use 32-bit for ImWchar (default is 16-bit) to support Unicode planes 1-16. (e.g. point beyond 0xFFFF like emoticons, dingbats, symbols, shapes, ancient languages, etc...) //#define IMGUI_USE_WCHAR32 diff --git a/libimgui/manifest b/libimgui/manifest index 9845f8a..b4f03a9 100644 --- a/libimgui/manifest +++ b/libimgui/manifest @@ -1,6 +1,6 @@ : 1 name: libimgui -version: 1.91.4 +version: 1.91.6 project: imgui summary: Dear ImGui: Bloat-free Graphical User interface for C++ with minimal dependencies license: MIT diff --git a/upstream b/upstream index 99109c0..993fa34 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 99109c0b3b052cffa154a9295440f68868a39f74 +Subproject commit 993fa347495860ed44b83574254ef2a317d0c14f diff --git a/upstream-docking b/upstream-docking index c71e4e8..947aa9c 160000 --- a/upstream-docking +++ b/upstream-docking @@ -1 +1 @@ -Subproject commit c71e4e8c7cb9b42b460bbaedfa4bc443f885b05b +Subproject commit 947aa9c9722bd6ff740dd757da609ff41f4d3ba3