Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0_MenuUIRework

This commit is contained in:
Areloch 2020-06-01 03:48:20 -05:00
commit 69089e1ee2
297 changed files with 4174 additions and 470 deletions

View file

@ -150,6 +150,7 @@ GuiCanvas::GuiCanvas(): GuiControl(),
#else
mNumFences = 0;
#endif
mConsumeLastInputEvent = false;
}
GuiCanvas::~GuiCanvas()

View file

@ -57,6 +57,8 @@ GuiScriptNotifyCtrl::GuiScriptNotifyCtrl()
mOnResize = false;
mOnChildResized = false;
mOnParentResized = false;
mOnLoseFirstResponder = true;
mOnGainFirstResponder = true;
}
GuiScriptNotifyCtrl::~GuiScriptNotifyCtrl()

View file

@ -79,6 +79,7 @@ GuiCursor::GuiCursor()
mRenderOffset.set(0.0f,0.0f);
mExtent.set(1,1);
mTextureObject = NULL;
mBitmapName = StringTable->EmptyString();
}
GuiCursor::~GuiCursor()