Merge branch 'master' into docking

# Conflicts: # imgui.cpp
2026-04-02 05:27:40 -05:00 · 2026-03-13 17:09:34 +01:00
parent 80f8298769 4a2e3cce69
commit 60d7fb207e
12 changed files with 156 additions and 44 deletions
--- a/backends/imgui_impl_vulkan.cpp
+++ b/backends/imgui_impl_vulkan.cpp
@@ -1427,6 +1427,7 @@ VkDescriptorSet ImGui_ImplVulkan_AddTexture(VkSampler sampler, VkImageView image
    }

    // Update the Descriptor Set:
+    if (descriptor_set != VK_NULL_HANDLE)
    {
        VkDescriptorImageInfo desc_image[1] = {};
        desc_image[0].sampler = sampler;