mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-22 04:40:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	examples/imgui_impl_opengl3.cpp
This commit is contained in:
omar
2019-03-03 23:34:56 +01:00
parent 7a536f1bd2 beb3062dc5
commit 49eb5f0280
7 changed files with 88 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
imgui_widgets.cpp
View File

@@ -4253,8 +4253,10 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl
{
ImGuiContext& g = *GImGui;
ImGuiWindow* window = GetCurrentWindow();
ImDrawList* draw_list = window->DrawList;
if (window->SkipItems)
return false;
ImDrawList* draw_list = window->DrawList;
ImGuiStyle& style = g.Style;
ImGuiIO& io = g.IO;