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

Merge remote-tracking branch 'upstream/development' into ShaderConstBuffer-CleanupRefactor

Browse source
This commit is contained in:
marauder2k7 2024-03-14 08:32:38 +00:00
commit 89843b541c
4 changed files with 48 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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