repair docking branch (some merge commit broke it)

This commit is contained in:
Victor Bombi
2020-10-18 19:46:25 +02:00
parent 213086639f
commit 44af224530
14 changed files with 9612 additions and 3075 deletions

View File

@@ -94,13 +94,17 @@ igCombo 3
1 bool igComboStr_arr (const char*,int*,const char* const[],int,int)
2 bool igComboStr (const char*,int*,const char*,int)
3 bool igComboFnBoolPtr (const char*,int*,bool(*)(void*,int,const char**),void*,int,int)
igGetBackgroundDrawList 2
1 ImDrawList* igGetBackgroundDrawListNil ()
2 ImDrawList* igGetBackgroundDrawListViewportPtr (ImGuiViewport*)
igGetColorU32 3
1 ImU32 igGetColorU32Col (ImGuiCol,float)
2 ImU32 igGetColorU32Vec4 (const ImVec4)
3 ImU32 igGetColorU32U32 (ImU32)
igGetForegroundDrawList 2
igGetForegroundDrawList 3
1 ImDrawList* igGetForegroundDrawListNil ()
2 ImDrawList* igGetForegroundDrawListWindowPtr (ImGuiWindow*)
2 ImDrawList* igGetForegroundDrawListViewportPtr (ImGuiViewport*)
3 ImDrawList* igGetForegroundDrawListWindowPtr (ImGuiWindow*)
igGetID 3
1 ImGuiID igGetIDStr (const char*)
2 ImGuiID igGetIDStrStr (const char*,const char*)
@@ -220,4 +224,4 @@ igValue 4
2 void igValueInt (const char*,int)
3 void igValueUint (const char*,unsigned int)
4 void igValueFloat (const char*,float,const char*)
155 overloaded
158 overloaded