Make return type from loadPagedModel explicit.

[simgear.git] / simgear / scene / model / ModelRegistry.hxx

diff --git a/simgear/scene/model/ModelRegistry.hxx b/simgear/scene/model/ModelRegistry.hxx
index 24e78eb27c645ec0e69e65d016f3a9cd119b71dc..8c8e7467386cd6c7bda347f6678cdb89147f9445 100644 (file)
--- a/simgear/scene/model/ModelRegistry.hxx
+++ b/simgear/scene/model/ModelRegistry.hxx
@@ -95,7 +95,8 @@ public:
                 optimizedNode = _optimizePolicy.optimize(processedNode.get(),
                                                          fileName, opt);
             }
-            _bvhPolicy.buildBVH(fileName, optimizedNode.get());
+            if (opt->getPluginStringData("SimGear::BOUNDINGVOLUMES") != "OFF")
+                _bvhPolicy.buildBVH(fileName, optimizedNode.get());
             _cachePolicy.addToCache(fileName, optimizedNode.get());
         }
         return ReaderWriter::ReadResult(optimizedNode.get());