Merge pull request from AndrewMeadows/bugz1069

BUGZ-1069: fix crash in oven for lack of MaterialCache instance in DependencyManager
This commit is contained in:
Sabrina Shanman 2019-08-02 09:24:08 -07:00 committed by GitHub
commit ad298cb132
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -21,6 +21,7 @@
#include <ResourceManager.h>
#include <ResourceRequestObserver.h>
#include <ResourceCache.h>
#include <material-networking/MaterialCache.h>
#include <material-networking/TextureCache.h>
#include <hfm/ModelFormatRegistry.h>
#include <FBXSerializer.h>
@ -42,6 +43,7 @@ Oven::Oven() {
DependencyManager::set<ResourceRequestObserver>();
DependencyManager::set<ResourceCacheSharedItems>();
DependencyManager::set<TextureCache>();
DependencyManager::set<MaterialCache>();
MaterialBaker::setNextOvenWorkerThreadOperator([] {
return Oven::instance().getNextWorkerThread();