From 9bea6afb80bbb9e2e350566056f5ba14f3f11acd Mon Sep 17 00:00:00 2001 From: Julian Smith Date: Thu, 5 Sep 2019 14:58:47 +0100 Subject: [PATCH] Revert "simgear/scene/model/ModelRegistry.cxx: avoid noisy diagnostic from OSG." This reverts commit 7762bc2cad01426cd8f5402582b8e53e6644b5c3. This broke Windows and Mac builds. --- simgear/scene/model/ModelRegistry.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/simgear/scene/model/ModelRegistry.cxx b/simgear/scene/model/ModelRegistry.cxx index e128d390..0087cbbf 100644 --- a/simgear/scene/model/ModelRegistry.cxx +++ b/simgear/scene/model/ModelRegistry.cxx @@ -608,10 +608,7 @@ osg::ref_ptr DefaultCachePolicy::find(const string& fileName, const O void DefaultCachePolicy::addToCache(const string& fileName, osg::Node* node) { - /* Avoid default options=NULL in this call, as it provokes noisy diagnostic - in OSG. */ - Options options; - Registry::instance()->addEntryToObjectCache(fileName, node, 0 /*timestamp*/, &options); + Registry::instance()->addEntryToObjectCache(fileName, node); } // Optimizations we don't use: