Fixed --shading-flat option so it sets the material properties correctly.

diff --git a/src/Objects/materialmgr.cxx b/src/Objects/materialmgr.cxx
index 90b007636197b6561322a345827e52f06efedad1..73cc8f96e5dd5dcd5cc17245db473901f025b3f9 100644 (file)
--- a/src/Objects/materialmgr.cxx
+++ b/src/Objects/materialmgr.cxx
@@ -179,7 +179,11 @@ fgMATERIAL_MGR::load_lib ( void )
 
            ssgSimpleState *state = new ssgSimpleState;
            state->enable( GL_LIGHTING );
-           state->setShadeModel( GL_SMOOTH );
+           if ( current_options.get_shading() == 1 ) {
+               state->setShadeModel( GL_SMOOTH );
+           } else {
+               state->setShadeModel( GL_FLAT );
+           }
            state->enable ( GL_CULL_FACE      ) ;
            if ( current_options.get_textures() ) {
                state->enable( GL_TEXTURE_2D );

diff --git a/src/Scenery/tileentry.hxx b/src/Scenery/tileentry.hxx
index aaa9088a8c65509ada0f546b65138b056a2c5afe..5b6824d6f27ab463c00839c32112b4122f8161c8 100644 (file)
--- a/src/Scenery/tileentry.hxx
+++ b/src/Scenery/tileentry.hxx
@@ -48,7 +48,6 @@
 #include <ssg.h>               // plib includes
 
 #include <Bucket/newbucket.hxx>
-#include <Math/mat3.h>
 #include <Math/point3d.hxx>
 #include <Objects/fragment.hxx>