Merge remote-tracking branch 'origin' into 2016-02-colorpicker

This commit is contained in:
ocornut
2016-09-25 12:57:22 +02:00
34 changed files with 158 additions and 122 deletions

View File

@ -258,6 +258,7 @@ struct ImGuiGroupData
ImVec2 BackupCursorPos;
ImVec2 BackupCursorMaxPos;
float BackupIndentX;
float BackupGroupOffsetX;
float BackupCurrentLineHeight;
float BackupCurrentLineTextBaseOffset;
float BackupLogLinePosY;