Merge branch 'master' into viewport

This commit is contained in:
omar
2018-03-09 10:41:12 +01:00
8 changed files with 51 additions and 28 deletions

View File

@ -714,7 +714,7 @@ struct ImGuiContext
ImGuiID DragDropAcceptIdPrev; // Target item id from previous frame (we need to store this to allow for overlapping drag and drop targets)
int DragDropAcceptFrameCount; // Last time a target expressed a desire to accept the source
ImVector<unsigned char> DragDropPayloadBufHeap; // We don't expose the ImVector<> directly
unsigned char DragDropPayloadBufLocal[8];
unsigned char DragDropPayloadBufLocal[8]; // Local buffer for small payloads
// Widget state
ImGuiTextEditState InputTextState;