mirrors
/
bgfx
mirror of https://github.com/bkaradzic/bgfx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup.

This commit is contained in:
Branimir Karadžić 2018-05-28 11:43:36 -07:00
parent a119d34b7c
commit 7d748cbe44
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/dear-imgui/imgui.cpp vendored
View File

@ -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);

8
src/bgfx.cpp
View File

@ -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[] =