Merge branch 'jmt/ref_ptr-conv'

[simgear.git] / simgear / scene / tgdb / SGReaderWriterBTGOptions.hxx

diff --git a/simgear/scene/tgdb/SGReaderWriterBTGOptions.hxx b/simgear/scene/tgdb/SGReaderWriterBTGOptions.hxx
index 86174bf20a3da906375e1aab1e03c02f85c2be48..b1d21b5dde70c865a9615d9e9a427a709db46e50 100644 (file)
--- a/simgear/scene/tgdb/SGReaderWriterBTGOptions.hxx
+++ b/simgear/scene/tgdb/SGReaderWriterBTGOptions.hxx
@@ -15,20 +15,19 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 #ifndef SGREADERWRITERBTGOPTIONS_HXX
-#define SGREADERWRITERBTGOPTIONS_HXX 1
+#define SGREADERWRITERBTGOPTIONS_HXX
 
 #include <osgDB/ReaderWriter>
 #include <simgear/scene/tgdb/obj.hxx>
 class SGReaderWriterBTGOptions : public osgDB::ReaderWriter::Options {
 public:
-    SGReaderWriterBTGOptions() {}
-    SGReaderWriterBTGOptions(const std::string& str):
+    SGReaderWriterBTGOptions(const std::string& str = std::string()) :
         osgDB::ReaderWriter::Options(str),
-        _matlib(0), _calcLights(false),
+        _matlib(0), _calcLights(true),
         _useRandomObjects(false),
         _useRandomVegetation(false)
     {}
-    
+
     SGReaderWriterBTGOptions(const SGReaderWriterBTGOptions& options,
             const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY):
         osgDB::ReaderWriter::Options(options, copyop),