Merge branch 'NateEag-master-patch-12920' into 'master'

[xonotic/netradiant.git] / contrib / brushexport / export.cpp

diff --git a/contrib/brushexport/export.cpp b/contrib/brushexport/export.cpp
index 4a1e2d4c2d2566796aeebc2033c5b9eefd511c89..86a7767ba4f542298444394a0b68a1e57b3b6348 100644 (file)
--- a/contrib/brushexport/export.cpp
+++ b/contrib/brushexport/export.cpp
@@ -1,4 +1,5 @@
 #include "export.h"
+#include "globaldefs.h"
 #include "debugging/debugging.h"
 #include "ibrush.h"
 #include "iscenegraph.h"
@@ -12,7 +13,7 @@
 #include "../../radiant/brush.h"
 
 // for limNames
-#define MAX_MATERIAL_NAME 20
+const int MAX_MATERIAL_NAME = 20;
 
 /*
     Abstract baseclass for modelexporters
@@ -126,7 +127,7 @@ void ExportData::AddBrushFace( Face& f ){
        // add face to current group
        current->faces.push_back( &f );
 
-#ifdef _DEBUG
+#if GDEF_DEBUG
        globalOutputStream() << "Added Face to group " << current->name.c_str() << "\n";
 #endif
 }
@@ -143,7 +144,7 @@ void ExportData::GetShaderNameFromShaderPath( const char* path, std::string& nam
                name = tmp.substr( last_slash + 1, tmp.length() - last_slash );
        }
 
-#ifdef _DEBUG
+#if GDEF_DEBUG
        globalOutputStream() << "Last: " << (const unsigned int) last_slash << " " << "length: " << (const unsigned int)tmp.length() << "Name: " << name.c_str() << "\n";
 #endif
 }
@@ -295,7 +296,7 @@ bool ExportDataAsWavefront::WriteToFile( const std::string& path, collapsemode m
                        return false;
                }
 
-               outMtl << "# Wavefront material file exported with NetRadiants brushexport plugin.\n";
+               outMtl << "# Wavefront material file exported with " RADIANT_NAME " brushexport plugin.\n";
                outMtl << "# Material Count: " << (const Unsigned)materials.size() << "\n\n";
                for ( std::set<std::string>::const_iterator it( materials.begin() ); it != materials.end(); ++it )
                {