New PathsDialog, for managing locations.

[flightgear.git] / src / Scenery / scenery.cxx

diff --git a/src/Scenery/scenery.cxx b/src/Scenery/scenery.cxx
index c05d6eeff12d9adc9def8b2f069e467bbbb96a06..6b4edc0e826bc1f67ddf5c94a6256ba55b3b80d1 100644 (file)
--- a/src/Scenery/scenery.cxx
+++ b/src/Scenery/scenery.cxx
@@ -384,7 +384,7 @@ FGScenery::get_elevation_m(const SGGeod& geod, double& alt,
 
   FGSceneryIntersect intersectVisitor(SGLineSegmentd(start, end), butNotFrom);
   intersectVisitor.setTraversalMask(SG_NODEMASK_TERRAIN_BIT);
-  terrain_branch->accept(intersectVisitor);
+  get_scene_graph()->accept(intersectVisitor);
 
   if (!intersectVisitor.getHaveHit())
       return false;
@@ -413,7 +413,7 @@ FGScenery::get_cart_ground_intersection(const SGVec3d& pos, const SGVec3d& dir,
 
   FGSceneryIntersect intersectVisitor(SGLineSegmentd(start, end), butNotFrom);
   intersectVisitor.setTraversalMask(SG_NODEMASK_TERRAIN_BIT);
-  terrain_branch->accept(intersectVisitor);
+  get_scene_graph()->accept(intersectVisitor);
 
   if (!intersectVisitor.getHaveHit())
       return false;
@@ -436,10 +436,14 @@ bool FGScenery::scenery_available(const SGGeod& position, double range_m)
     // currently the PagedLODs will not be loaded by the DatabasePager
     // while the splashscreen is there, so CheckSceneryVisitor force-loads
     // missing objects in the main thread
-    terrain_branch->accept(csnv);
-    if(!csnv.isLoaded())
+    get_scene_graph()->accept(csnv);
+    if(!csnv.isLoaded()) {
+        SG_LOG(SG_TERRAIN, SG_DEBUG, "FGScenery::scenery_available: waiting on CheckSceneryVisitor");
         return false;
+    }
     return true;
+  } else {
+    SG_LOG(SG_TERRAIN, SG_DEBUG, "FGScenery::scenery_available: waiting on tile manager");
   }
   return false;
 }