TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

TORQUE_TOOLS off compile fix

Browse source 
fix a cornercase for when TORQUE_TOOLS is #undef at the torqueconfig.h level
This commit is contained in:
AzaezelX 2024-03-10 14:29:17 -05:00
parent 9f5c74c79a
commit 07ed59a872
2 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Engine/source/console/consoleFunctions.h
View file

@ -18,7 +18,12 @@ void gotoWebPage(const char* address);
bool getDocsURL(void* obj, const char* array, const char* data); bool getDocsURL(void* obj, const char* array, const char* data);
const char* getDocsLink(const char* filename, U32 lineNumber); const char* getDocsLink(const char* filename, U32 lineNumber);
#ifdef TORQUE_TOOLS
#define docsURL addGroup("Ungrouped");\ #define docsURL addGroup("Ungrouped");\
addProtectedField("docsURL", TypeBool, Offset(mDocsClick, ConsoleObject), &getDocsURL, &defaultProtectedGetFn, getDocsLink(__FILE__,__LINE__), AbstractClassRep::FieldFlags::FIELD_ComponentInspectors);\ addProtectedField("docsURL", TypeBool, Offset(mDocsClick, ConsoleObject), &getDocsURL, &defaultProtectedGetFn, getDocsLink(__FILE__,__LINE__), AbstractClassRep::FieldFlags::FIELD_ComponentInspectors);\
endGroup("Ungrouped") endGroup("Ungrouped")
#else
#define docsURL NULL
#endif
#endif #endif

2
Engine/source/gui/editor/guiMenuBar.cpp
View file

@ -581,6 +581,7 @@ PopupMenu* GuiMenuBar::findMenu(String barTitle)
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Console Methods // Console Methods
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifdef TORQUE_TOOLS
DefineEngineMethod(GuiMenuBar, attachToCanvas, void, (const char *canvas, S32 pos), , "(GuiCanvas, pos)") DefineEngineMethod(GuiMenuBar, attachToCanvas, void, (const char *canvas, S32 pos), , "(GuiCanvas, pos)")
{ {
GuiCanvas* canv = dynamic_cast<GuiCanvas*>(Sim::findObject(canvas)); GuiCanvas* canv = dynamic_cast<GuiCanvas*>(Sim::findObject(canvas));
@ -597,6 +598,7 @@ DefineEngineMethod(GuiMenuBar, removeFromCanvas, void, (), , "()")
if(canvas) if(canvas)
canvas->setMenuBar(nullptr); canvas->setMenuBar(nullptr);
} }
#endif
DefineEngineMethod(GuiMenuBar, getMenuCount, S32, (), , "()") DefineEngineMethod(GuiMenuBar, getMenuCount, S32, (), , "()")
{ {