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

Utilizes old method to clean up tree items in GuiTreeViewCtrl to resolve guiEditor crashes

Browse source 
Updates probeManager to correctly utilize skylight idx to infer if a skylight is active, and set the SKYLIGHT_ONLY macro correctly, resolving erroneous behavior
Cleaned up some of the guiEditor initialization script to remove redundancy
Cleaned up tools modules loading script to remove redundancy
This commit is contained in:
Areloch 2019-09-18 01:41:57 -05:00
parent 9db95f4fb2
commit ff4c2d59fc
6 changed files with 155 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Templates/BaseGame/game/tools/guiEditor/scripts/guiEditor.ed.cs
View file

@ -74,22 +74,14 @@ function toggleGuiEditor( %make )
{
if( EditorIsActive() && !GuiEditor.toggleIntoEditorGui )
toggleEditor( true );
if( !isObject( GuiEditCanvas ) )
new GuiControl( GuiEditCanvas, EditorGuiGroup );
if( GuiEditorIsActive() )
if( $InGuiEditor || GuiEditorIsActive() )
{
GuiEditor.close();
}
else
{
GuiEditor.open();
// Cancel the scheduled event to prevent
// the level from cycling after it's duration
// has elapsed.
cancel($Game::Schedule);
}
// Cancel the scheduled event to prevent
@ -115,6 +107,9 @@ package GuiEditor_BlockDialogs
function GuiEditor::open(%this)
{
if( !isObject( GuiEditCanvas ) )
new GuiControl( GuiEditCanvas, EditorGuiGroup );
GuiEditCanvas.onCreateMenu();
GuiEditContent(Canvas.getContent());

2
Templates/BaseGame/game/tools/guiEditor/scripts/guiEditorCanvas.ed.cs
View file

@ -31,7 +31,7 @@ function GuiEditCanvas::onAdd( %this )
{
// %this.setWindowTitle("Torque Gui Editor");
%this.onCreateMenu();
//%this.onCreateMenu();
}
//---------------------------------------------------------------------------------------------