Merge remote-tracking branch 'refs/remotes/origin/master' into vulkan

Former-commit-id: 9d9dd1911274454b894c54d001c910bf52863765 [formerly 616938eab3b011f03e789f072e86d48215277f70]
Former-commit-id: 7d2fb298601e262bebb267f864d1066fb31460aa
This commit is contained in:
Lynix 2016-07-08 12:40:54 +02:00
commit 8d3680f4b9
1 changed files with 1 additions and 0 deletions

View File

@ -148,6 +148,7 @@ namespace Nz
static MeshLoader::LoaderList s_loaders;
static MeshManager::ManagerMap s_managerMap;
static MeshManager::ManagerParams s_managerParameters;
static MeshSaver::SaverList s_savers;
};
}