From: curt <curt>
Date: Mon, 6 Mar 2000 23:28:52 +0000 (+0000)
Subject: Pass NULL for ColourArray when creating cloud objects.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=8d27e09b915b998708f4bb93d43f7645cd0a37e6;p=flightgear.git

Pass NULL for ColourArray when creating cloud objects.
---

diff --git a/src/Objects/materialmgr.cxx b/src/Objects/materialmgr.cxx
index 2a73daf07..861d0d800 100644
--- a/src/Objects/materialmgr.cxx
+++ b/src/Objects/materialmgr.cxx
@@ -176,7 +176,7 @@ fgMATERIAL_MGR::load_lib ( void )
 	    FGPath tex_file( current_options.get_fg_root() );
 	    tex_file.append( "Textures" );
 	    tex_file.append( m.get_texture_name() );
-	    tex_file.concat( ".rgb" );
+	    // tex_file.concat( ".rgb" );
 
 	    FG_LOG( FG_TERRAIN, FG_INFO, "  Loading material " 
 		    << material_name << " (" << tex_file.c_str() << ")");
diff --git a/src/Objects/obj.cxx b/src/Objects/obj.cxx
index bb0766219..7bef8bf9d 100644
--- a/src/Objects/obj.cxx
+++ b/src/Objects/obj.cxx
@@ -229,7 +229,6 @@ ssgBranch *fgGenTile( const string& path, FGTileEntry *t) {
     ssgVertexArray   *vl = new ssgVertexArray( 4 );
     ssgNormalArray   *nl = new ssgNormalArray( 4 );
     ssgTexCoordArray *tl = new ssgTexCoordArray( 4 );
-    ssgColourArray   *cl = new ssgColourArray( 4 );
 
     // sgVec3 *vtlist = new sgVec3 [ 4 ];
     // t->vec3_ptrs.push_back( vtlist );
@@ -254,7 +253,7 @@ ssgBranch *fgGenTile( const string& path, FGTileEntry *t) {
     }
     
     ssgLeaf *leaf = 
-	new ssgVtxTable ( GL_TRIANGLE_FAN, vl, nl, tl, cl );
+	new ssgVtxTable ( GL_TRIANGLE_FAN, vl, nl, tl, NULL );
 
     leaf->setState( state );
 
@@ -757,7 +756,6 @@ ssgBranch *fgObjLoad( const string& path, FGTileEntry *t, const bool is_base) {
 		ssgVertexArray   *vl = new ssgVertexArray( size );
 		ssgNormalArray   *nl = new ssgNormalArray( size );
 		ssgTexCoordArray *tl = new ssgTexCoordArray( size );
-		ssgColourArray   *cl = new ssgColourArray();
 
 		sgVec2 tmp2;
 		sgVec3 tmp3;
@@ -776,11 +774,11 @@ ssgBranch *fgObjLoad( const string& path, FGTileEntry *t, const bool is_base) {
 		if ( token == "tf" ) {
 		    // triangle fan
 		    leaf = 
-			new ssgVtxTable ( GL_TRIANGLE_FAN, vl, nl, tl, cl );
+			new ssgVtxTable ( GL_TRIANGLE_FAN, vl, nl, tl, NULL );
 		} else {
 		    // triangle strip
 		    leaf = 
-			new ssgVtxTable ( GL_TRIANGLE_STRIP, vl, nl, tl, cl );
+			new ssgVtxTable ( GL_TRIANGLE_STRIP, vl, nl, tl, NULL );
 		}
 		// leaf->makeDList();
 		leaf->setState( state );