Browse Source

fix eronous extra glue code in macro, fix slash direction in include

AzaezelX 4 years ago
parent
commit
76386f433c

+ 1 - 1
Engine/source/T3D/assets/MaterialAsset.h

@@ -248,7 +248,7 @@ public: \
    }\
    }\
    SimObjectPtr<Material> get##name##Resource() \
    SimObjectPtr<Material> get##name##Resource() \
    {\
    {\
-      return m##name##;\
+      return m##name;\
    }
    }
 
 
 #define DECLARE_MATERIALASSET_SETGET(className, name)\
 #define DECLARE_MATERIALASSET_SETGET(className, name)\

+ 1 - 1
Engine/source/materials/materialDefinition.cpp

@@ -37,7 +37,7 @@
 #include "core/util/safeDelete.h"
 #include "core/util/safeDelete.h"
 #include "T3D/accumulationVolume.h"
 #include "T3D/accumulationVolume.h"
 #include "gui/controls/guiTreeViewCtrl.h"
 #include "gui/controls/guiTreeViewCtrl.h"
-#include <console\persistenceManager.h>
+#include <console/persistenceManager.h>
 
 
 IMPLEMENT_CONOBJECT(Material);
 IMPLEMENT_CONOBJECT(Material);