mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-02 08:49:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/PerformanceATM

Browse Source 
# Conflicts:
#	data/assets/default.scene
#	data/assets/scene/solarsystem/planets/earth/earth.asset
This commit is contained in:
Alexander Bock
2018-03-14 23:26:56 -04:00
parent 968cbef474 ca8111dc48
commit d1cdc3d26f
70 changed files with 1333 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/openspace/scene/asset.h
+2 -1
View File
@@ -83,7 +83,8 @@ public:
void clearSynchronizations();
std::vector<std::shared_ptr<ResourceSynchronization>> ownSynchronizations() const;
void syncStateChanged(ResourceSynchronization::State s);
void syncStateChanged(std::shared_ptr<ResourceSynchronization> sync,
ResourceSynchronization::State s);
/**
* Load this asset and return true if successful,