This 'fixes' #613 but partly re-introduces #553.

diff --git a/src/Scenery/tilemgr.cxx b/src/Scenery/tilemgr.cxx
index 3599c3608848b9a052f5b1083f739e6b42511523..e235a8eda68103d24137c1671f29b21f6b9319b8 100644 (file)
--- a/src/Scenery/tilemgr.cxx
+++ b/src/Scenery/tilemgr.cxx
@@ -257,8 +257,8 @@ FGTileMgr::loadTileModel(const string& modelPath, bool cacheModel)
              * so we can run the Nasal stuff in the main thread.
              */
             result=
-                SGModelLib::loadDeferredModel(fullPath.str(), globals->get_props()/*,
-                                             new FGNasalModelData*/);
+                SGModelLib::loadDeferredModel(fullPath.str(), globals->get_props(),
+                                              _disableNasalHooks->getBoolValue() ? NULL : new FGNasalModelData);
         }
     } catch (const sg_io_exception& exc) {
         string m(exc.getMessage());