Pass NULL for ColourArray when creating cloud objects.

diff --git a/src/Objects/materialmgr.cxx b/src/Objects/materialmgr.cxx
index 2a73daf071f692a872c4ebf6e94e2fca42f26666..861d0d80006aa33d832841ac5afdf1021bc3d43f 100644 (file)
--- 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 bb0766219913203b6d8afd31a92ee7a761b44741..7bef8bf9d53d5b866b367aece46db27f0d935f46 100644 (file)
--- 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 );