Branimir Karadžić 7 years ago
parent
commit
7d748cbe44
2 changed files with 5 additions and 5 deletions
  1. 1 1
      3rdparty/dear-imgui/imgui.cpp
  2. 4 4
      src/bgfx.cpp

+ 1 - 1
3rdparty/dear-imgui/imgui.cpp

@@ -6253,7 +6253,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
         window->DC.ChildWindows.resize(0);
         window->DC.LayoutType = ImGuiLayoutType_Vertical;
         window->DC.ParentLayoutType = parent_window ? parent_window->DC.LayoutType : ImGuiLayoutType_Vertical;
-        window->DC.ItemFlags = ImGuiItemFlags_Default_;
+        window->DC.ItemFlags = parent_window ? parent_window->DC.ItemFlags : ImGuiItemFlags_Default_;
         window->DC.ItemWidth = window->ItemWidthDefault;
         window->DC.TextWrapPos = -1.0f; // disabled
         window->DC.ItemFlagsStack.resize(0);

+ 4 - 4
src/bgfx.cpp

@@ -1365,17 +1365,17 @@ namespace bgfx
 
 	static const char* s_topologyName[] =
 	{
-		"TriList",
+		"Triangles",
 		"TriStrip",
-		"Line",
+		"Lines",
 		"LineStrip",
-		"Point",
+		"Points",
 	};
 	BX_STATIC_ASSERT(Topology::Count == BX_COUNTOF(s_topologyName) );
 
 	const char* getName(Topology::Enum _topology)
 	{
-		return s_topologyName[_topology];
+		return s_topologyName[bx::min(_topology, Topology::PointList)];
 	}
 
 	static TextureFormat::Enum s_emulatedFormats[] =