Browse Source

Tables: Fixed command merging when compiling with VS2013. (#6377)

ocornut 2 years ago
parent
commit
7c291ba31b
2 changed files with 5 additions and 3 deletions
  1. 2 0
      docs/CHANGELOG.txt
  2. 3 3
      imgui_tables.cpp

+ 2 - 0
docs/CHANGELOG.txt

@@ -44,6 +44,8 @@ Other changes:
 
 
 - Tables: Fixed a small miscalculation in TableHeader() leading to an empty tooltip
 - Tables: Fixed a small miscalculation in TableHeader() leading to an empty tooltip
   showing when a sorting column has no visible name. (#6342) [@lukaasm]
   showing when a sorting column has no visible name. (#6342) [@lukaasm]
+- Tables: Fixed command merging when compiling with VS2013 (one array on stack was not
+  initialized on VS2013. Unsure if due to a bug or UB/standard conformance). (#6377)
 - InputText: Avoid setting io.WantTextInputNextFrame during the deactivation frame.
 - InputText: Avoid setting io.WantTextInputNextFrame during the deactivation frame.
   (#6341) [@lukaasm]
   (#6341) [@lukaasm]
 - Nav: Fixed navigation within tables/columns where item boundaries goes beyond columns limits,
 - Nav: Fixed navigation within tables/columns where item boundaries goes beyond columns limits,

+ 3 - 3
imgui_tables.cpp

@@ -2383,11 +2383,11 @@ void ImGui::TableMergeDrawChannels(ImGuiTable* table)
     struct MergeGroup
     struct MergeGroup
     {
     {
         ImRect          ClipRect;
         ImRect          ClipRect;
-        int             ChannelsCount;
-        ImBitArrayPtr   ChannelsMask;
+        int             ChannelsCount = 0;
+        ImBitArrayPtr   ChannelsMask = NULL;
     };
     };
     int merge_group_mask = 0x00;
     int merge_group_mask = 0x00;
-    MergeGroup merge_groups[4] = {};
+    MergeGroup merge_groups[4];
 
 
     // Use a reusable temp buffer for the merge masks as they are dynamically sized.
     // Use a reusable temp buffer for the merge masks as they are dynamically sized.
     const int max_draw_channels = (4 + table->ColumnsCount * 2);
     const int max_draw_channels = (4 + table->ColumnsCount * 2);