Slightly update the seasonal texture support code.

diff --git a/simgear/scene/material/mat.cxx b/simgear/scene/material/mat.cxx
index 0c493ce82800ea36babfe43e8d4186fffa1687bf..a886f33e0484b87d8d71f94d615fe9dcb2f78508 100644 (file)
--- a/simgear/scene/material/mat.cxx
+++ b/simgear/scene/material/mat.cxx
@@ -94,8 +94,12 @@ SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props
   for (unsigned int i = 0; i < textures.size(); i++)
   {
     string tname = textures[i]->getStringValue();
-    if (strncmp(season, "summer", 6) && tname.substr(0,7) == "Terrain")
-       tname.insert(7,"."+string(season));
+    string otname = tname;
+    if (season && strncmp(season, "summer", 6))
+    {
+        if (tname.substr(0,7) == "Terrain")
+            tname.insert(7,"."+string(season));
+    }
 
     if (tname == "") {
         tname = "unknown.rgb";

diff --git a/simgear/scene/material/mat.hxx b/simgear/scene/material/mat.hxx
index 9c2284ef4f07a2b9833ceb2daf4d41b4e4c35f2e..b980a0069aca80a7fd3578e3c30449236e4f026f 100644 (file)
--- a/simgear/scene/material/mat.hxx
+++ b/simgear/scene/material/mat.hxx
@@ -71,7 +71,7 @@ public:
    * state information for the material.  This node is usually
    * loaded from the $FG_ROOT/materials.xml file.
    */
-  SGMaterial( const string &fg_root, const SGPropertyNode *props, const char *season = "summer" );
+  SGMaterial( const string &fg_root, const SGPropertyNode *props, const char *season );
 
 
   /**

diff --git a/simgear/scene/material/matlib.cxx b/simgear/scene/material/matlib.cxx
index 3347aa850c5d2ac06c5cc42bbd2c616a7d95bb6f..5ce238b5355da1c6f0407c8102a34e777579547c 100644 (file)
--- a/simgear/scene/material/matlib.cxx
+++ b/simgear/scene/material/matlib.cxx
@@ -192,7 +192,7 @@ bool SGMaterialLib::load( const string &fg_root, const string& mpath, const char
     for (int i = 0; i < nMaterials; i++) {
         const SGPropertyNode * node = materials.getChild(i);
         if (!strcmp(node->getName(), "material")) {
-            SGMaterial *m = new SGMaterial( fg_root, node );
+            SGMaterial *m = new SGMaterial( fg_root, node, season );
 
             vector<SGPropertyNode_ptr>names = node->getChildren("name");
             for ( unsigned int j = 0; j < names.size(); j++ ) {

diff --git a/simgear/scene/material/matlib.hxx b/simgear/scene/material/matlib.hxx
index 460a723ce73e36c8dc7d58086c120d219829fd67..f457d2760bbec1ce07a3ce7520d3dd58e55e8676 100644 (file)
--- a/simgear/scene/material/matlib.hxx
+++ b/simgear/scene/material/matlib.hxx
@@ -64,7 +64,7 @@ public:
     SGMaterialLib ( void );
 
     // Load a library of material properties
-    bool load( const string &fg_root, const string& mpath, const char *season = "summer" );
+    bool load( const string &fg_root, const string& mpath, const char *season );
 
     // Add the named texture with default properties
     bool add_item( const string &tex_path );