From 76386f433c73eb2cc2db6409fa40596b313bf4bf Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Mon, 9 Aug 2021 22:08:55 -0500 Subject: [PATCH] fix eronous extra glue code in macro, fix slash direction in include --- Engine/source/T3D/assets/MaterialAsset.h | 2 +- Engine/source/materials/materialDefinition.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Engine/source/T3D/assets/MaterialAsset.h b/Engine/source/T3D/assets/MaterialAsset.h index 3ba5cdce4..c1582dcf8 100644 --- a/Engine/source/T3D/assets/MaterialAsset.h +++ b/Engine/source/T3D/assets/MaterialAsset.h @@ -248,7 +248,7 @@ public: \ }\ SimObjectPtr get##name##Resource() \ {\ - return m##name##;\ + return m##name;\ } #define DECLARE_MATERIALASSET_SETGET(className, name)\ diff --git a/Engine/source/materials/materialDefinition.cpp b/Engine/source/materials/materialDefinition.cpp index 987a60f36..7eb49ffc0 100644 --- a/Engine/source/materials/materialDefinition.cpp +++ b/Engine/source/materials/materialDefinition.cpp @@ -37,7 +37,7 @@ #include "core/util/safeDelete.h" #include "T3D/accumulationVolume.h" #include "gui/controls/guiTreeViewCtrl.h" -#include +#include IMPLEMENT_CONOBJECT(Material);