Fix that WITH_EDITOR is also defined when editor is not present

This commit is contained in:
nsubiron 2017-05-23 13:44:51 +01:00
parent d762b249c4
commit 54cd5fa775
4 changed files with 6 additions and 6 deletions

View File

@ -12,7 +12,7 @@ DECLARE_LOG_CATEGORY_EXTERN(LogCarla, Log, All);
DECLARE_LOG_CATEGORY_EXTERN(LogCarlaServer, Log, All);
// Options to compile with extra debug options.
#ifdef WITH_EDITOR
#if WITH_EDITOR
// #define CARLA_ROAD_GENERATOR_EXTRA_LOG /// @todo #1 Crashes in Linux.
// #define CARLA_SERVER_EXTRA_LOG
// #define CARLA_TAGGER_EXTRA_LOG

View File

@ -276,7 +276,7 @@ void ACityMapGenerator::GenerateRoadMap()
}
}
#ifdef WITH_EDITOR
#if WITH_EDITOR
RoadMap->Log();
#endif // WITH_EDITOR
@ -286,7 +286,7 @@ void ACityMapGenerator::GenerateRoadMap()
RoadMap->SaveAsPNG(FilePath);
}
#ifdef WITH_EDITOR
#if WITH_EDITOR
RoadMap->DrawDebugPixelsToLevel(GetWorld(), !bDrawDebugPixelsToLevel);
#endif // WITH_EDITOR
}

View File

@ -5,7 +5,7 @@
#include "HighResScreenshot.h"
#ifdef WITH_EDITOR
#if WITH_EDITOR
#include "DrawDebugHelpers.h"
#endif // WITH_EDITOR
@ -261,7 +261,7 @@ bool URoadMap::SaveAsPNG(const FString &Path) const
return true;
}
#ifdef WITH_EDITOR
#if WITH_EDITOR
void URoadMap::Log() const
{

View File

@ -141,7 +141,7 @@ public:
/// Save the current map as PNG with the pixel data encoded as color.
bool SaveAsPNG(const FString &Path) const;
#ifdef WITH_EDITOR
#if WITH_EDITOR
/// Log status of the map to the console.
void Log() const;