FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ehofman
2004-03-02 14:58:58 +00:00
parent 58a0b1d2c3
commit b7dd267807
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/material/mat.cxx
+3 -6
View File
@@ -105,8 +105,7 @@ SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props
tpath.append("Textures"); tpath.append("Textures");
tpath.append(tname); tpath.append(tname);
} }
_internal_state st = { NULL, "", false }; _internal_state st = { NULL, tpath.str(), false };
st.texture_path = tpath.str();
_status.push_back( st ); _status.push_back( st );
} }
@@ -115,8 +114,7 @@ SGMaterial::read_properties( const string &fg_root, const SGPropertyNode * props
SGPath tpath( fg_root ); SGPath tpath( fg_root );
tpath.append("Textures"); tpath.append("Textures");
tpath.append(tname); tpath.append(tname);
_internal_state st = { NULL, "", true }; _internal_state st = { NULL, tpath.str(), true };
st.texture_path = tpath.str();
_status.push_back( st ); _status.push_back( st );
} }
@@ -268,8 +266,7 @@ SGMaterial::build_ssg_state( bool defer_tex_load )
void SGMaterial::set_ssg_state( ssgSimpleState *s ) void SGMaterial::set_ssg_state( ssgSimpleState *s )
{ {
_internal_state st = { NULL, "", true }; _internal_state st = { s, "", true };
st.state = s;
st.state->ref(); st.state->ref();
_status.push_back( st ); _status.push_back( st );
} }