]> git.mxchange.org Git - simgear.git/commitdiff
Revert the last change, MSVC still doesn't like it.
authorehofman <ehofman>
Tue, 2 Mar 2004 14:58:58 +0000 (14:58 +0000)
committerehofman <ehofman>
Tue, 2 Mar 2004 14:58:58 +0000 (14:58 +0000)
simgear/scene/material/mat.cxx

index 839179349da6d134e778230b1098ad62a7a93909..eceed3c5601962d72a0e64329d13aadcbecaf8c9 100644 (file)
@@ -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 );
 }