#591: night-time rendering issues, avoid negative color values

[flightgear.git] / src / Model / acmodel.cxx

diff --git a/src/Model/acmodel.cxx b/src/Model/acmodel.cxx
index 3b0658b0a7173f82051da959778c729358c30a89..d4e8c0f48ac1a9dc444c121f760aa5ade5724cab 100644 (file)
--- a/src/Model/acmodel.cxx
+++ b/src/Model/acmodel.cxx
@@ -55,6 +55,8 @@ FGAircraftModel::FGAircraftModel ()
 
 FGAircraftModel::~FGAircraftModel ()
 {
+  // drop reference
+  _fx = 0;
   deinit();
 }
 
@@ -67,9 +69,9 @@ FGAircraftModel::init ()
     osg::Node *model = fgLoad3DModelPanel( path, globals->get_props());
     _aircraft->init( model );
   } catch (const sg_exception &ex) {
-    SG_LOG(SG_GENERAL, SG_ALERT, "Failed to load aircraft from " << path << ':');
-    SG_LOG(SG_GENERAL, SG_ALERT, "  " << ex.getFormattedMessage());
-    SG_LOG(SG_GENERAL, SG_ALERT, "(Falling back to glider.ac.)");
+    SG_LOG(SG_AIRCRAFT, SG_ALERT, "Failed to load aircraft from " << path << ':');
+    SG_LOG(SG_AIRCRAFT, SG_ALERT, "  " << ex.getFormattedMessage());
+    SG_LOG(SG_AIRCRAFT, SG_ALERT, "(Falling back to glider.ac.)");
     osg::Node *model = fgLoad3DModelPanel( "Models/Geometry/glider.ac",
                                            globals->get_props());
     _aircraft->init( model );
@@ -91,9 +93,6 @@ FGAircraftModel::reinit()
 void
 FGAircraftModel::deinit()
 {
-  // drop reference
-  _fx = 0;
-
   if (!_aircraft) {
     return;
   }