Canvas.MouseEvent: expose button/modifier state.

[flightgear.git] / src / Scripting / NasalModelData.cxx

diff --git a/src/Scripting/NasalModelData.cxx b/src/Scripting/NasalModelData.cxx
index 15bbf37ee723d4f2dfec1abb89b675407dab39d3..20df177ad590e39d97bd7e808606be37ddfe3944 100644 (file)
--- a/src/Scripting/NasalModelData.cxx
+++ b/src/Scripting/NasalModelData.cxx
@@ -1,6 +1,7 @@
 
 #include "NasalModelData.hxx"
 #include "NasalSys.hxx"
+#include <Main/fg_props.hxx>
 #include <Main/globals.hxx>
 
 #include <simgear/math/SGMath.hxx>
@@ -121,12 +122,8 @@ void FGNasalModelData::load()
   nasal::Hash module = nasalSys->getGlobals().createHash(_module);
   module.set("_module_id", _module_id);
 
-  if( !NasalNode::isInit() )
-  {
-    NasalNode::init("osg.Node")
+  NasalNode::init("osg.Node")
       .method("getPose", &f_node_getPose);
-  }
-
   module.set("_model", _branch);
 
   naRef arg[2];
@@ -197,6 +194,9 @@ void FGNasalModelDataProxy::modelLoaded( const std::string& path,
                                          SGPropertyNode *prop,
                                          osg::Node *branch )
 {
+    if( fgGetBool("/sim/disable-embedded-nasal") )
+        return;
+
     if(!prop)
         return;