mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed failed merging of master.

Browse Source
This commit is contained in:
Jonathas Costa
2019-07-31 15:05:52 -04:00
parent 77bc2d4e6d 87ce1925b9
commit 482631aa54
61 changed files with 21213 additions and 7434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/openspace/rendering/loadingscreen.h
View File

@@ -86,8 +86,8 @@ public:
struct ProgressInfo {
float progress = 0.f;
int currentSize = -1;
int totalSize = -1;
int64_t currentSize = -1;
int64_t totalSize = -1;
};
void updateItem(const std::string& itemIdentifier, const std::string& itemName,