Work around apparent OSG 3.2.0 normal binding bug.

[simgear.git] / simgear / scene / material / EffectBuilder.cxx

diff --git a/simgear/scene/material/EffectBuilder.cxx b/simgear/scene/material/EffectBuilder.cxx
index 338fc9aa33a34f274598225bc967e7cb89d86e5c..446659426523bc0c08b9deaebcfdca047c2b7e06 100644 (file)
--- a/simgear/scene/material/EffectBuilder.cxx
+++ b/simgear/scene/material/EffectBuilder.cxx
@@ -2,14 +2,14 @@
 #  include <simgear_config.h>
 #endif
 
-#include <simgear/scene/model/SGReaderWriterXMLOptions.hxx>
+#include <simgear/scene/util/SGReaderWriterOptions.hxx>
 #include <simgear/scene/tgdb/userdata.hxx>
 
-#include <simgear/math/SGMath.hxx>
-
 #include "EffectBuilder.hxx"
 #include "Effect.hxx"
 
+using std::string;
+
 namespace simgear
 {
 
@@ -43,7 +43,7 @@ const SGPropertyNode* getEffectPropertyChild(Effect* effect,
 }
 
 string getGlobalProperty(const SGPropertyNode* prop,
-                         const SGReaderWriterXMLOptions* options)
+                         const SGReaderWriterOptions* options)
 {
     if (!prop)
         return string();
@@ -54,7 +54,7 @@ string getGlobalProperty(const SGPropertyNode* prop,
     SGPropertyNode_ptr propRoot;
     if (propName[0] == '/') {
         return propName;
-    } else if ((propRoot = options->getPropRoot())) {
+    } else if ((propRoot = options->getPropertyNode())) {
         string result = propRoot->getPath();
         result.append("/");
         result.append(propName);
@@ -102,4 +102,14 @@ namespace effect
 {
 const char* colorFields[] = {"red", "green", "blue", "alpha"};
 }
+  
+PassAttributeBuilder::~PassAttributeBuilder()
+{
 }
+  
+} // of namespace simgear
+
+
+
+
+