From: ehofman <ehofman>
Date: Tue, 2 Mar 2004 14:58:58 +0000 (+0000)
Subject: Revert the last change, MSVC still doesn't like it.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=b7dd267807e5c8e454de08d0d33b94e6cfe7de27;p=simgear.git

Revert the last change, MSVC still doesn't like it.
---

diff --git a/simgear/scene/material/mat.cxx b/simgear/scene/material/mat.cxx
index 83917934..eceed3c5 100644
--- a/simgear/scene/material/mat.cxx
+++ b/simgear/scene/material/mat.cxx
@@ -105,8 +105,7 @@ SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props
       tpath.append("Textures");
       tpath.append(tname);
     }
-    _internal_state st = { NULL, "", false };
-    st.texture_path = tpath.str();
+    _internal_state st = { NULL, tpath.str(), false };
     _status.push_back( st );
   }
 
@@ -115,8 +114,7 @@ SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props
     SGPath tpath( fg_root );
     tpath.append("Textures");
     tpath.append(tname);
-    _internal_state st = { NULL, "", true };
-    st.texture_path = tpath.str();
+    _internal_state st = { NULL, tpath.str(), true };
     _status.push_back( st );
   }
 
@@ -268,8 +266,7 @@ SGMaterial::build_ssg_state( bool defer_tex_load )
 
 void SGMaterial::set_ssg_state( ssgSimpleState *s )
 {
-    _internal_state st = { NULL, "", true };
-    st.state = s;
+    _internal_state st = { s, "", true };
     st.state->ref();
     _status.push_back( st );
 }