From d4564434c39ac675de2ec328aff140fd5ca01cbb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 14 Jun 2020 17:12:35 -0400 Subject: [PATCH] FShowFlags: Remove use of cpp file Now that these constructs are constexpr capable, we can make use of constexpr here to contain it fully within the header. --- src/Core/Scene/FShowFlags.cpp | 3 --- src/Core/Scene/FShowFlags.h | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 src/Core/Scene/FShowFlags.cpp diff --git a/src/Core/Scene/FShowFlags.cpp b/src/Core/Scene/FShowFlags.cpp deleted file mode 100644 index 8f74758e..00000000 --- a/src/Core/Scene/FShowFlags.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "FShowFlags.h" - -const FShowFlags gkGameModeShowFlags = EShowFlag::MergedWorld | EShowFlag::ObjectGeometry | EShowFlag::Sky; diff --git a/src/Core/Scene/FShowFlags.h b/src/Core/Scene/FShowFlags.h index e54221be..cdfd0431 100644 --- a/src/Core/Scene/FShowFlags.h +++ b/src/Core/Scene/FShowFlags.h @@ -19,7 +19,7 @@ enum class EShowFlag : uint32 }; DECLARE_FLAGS_ENUMCLASS(EShowFlag, FShowFlags) -extern const FShowFlags gkGameModeShowFlags; +constexpr inline FShowFlags gkGameModeShowFlags{EShowFlag::MergedWorld | EShowFlag::ObjectGeometry | EShowFlag::Sky}; #endif // FSHOWFLAGS