TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2123 from nev7n/forestEditorFix

Browse source 
Fix forest editor failing to load forest
This commit is contained in:
Areloch 2017-11-27 01:18:19 -06:00 committed by Areloch
parent 763504f275
commit f264054405
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Templates/Empty/game/tools/forestEditor/forestEditorGui.cs
View file

@ -50,7 +50,7 @@ function ForestEditorGui::onActiveForestUpdated( %this, %forest, %createNew )
/// Called from a message box when a forest is not found. /// Called from a message box when a forest is not found.
function ForestEditorGui::createForest( %this ) function ForestEditorGui::createForest( %this )
{ {
%forestObject = parseMissionGroupForIds("Forest", ""); %forestObject = trim(parseMissionGroupForIds("Forest", ""));
if ( isObject( %forestObject ) ) if ( isObject( %forestObject ) )
{ {

4
Templates/Empty/game/tools/forestEditor/main.cs
View file

@ -143,7 +143,7 @@ function ForestEditorPlugin::onActivated( %this )
//ForestEditToolbar.setVisible( true ); //ForestEditToolbar.setVisible( true );
//Get our existing forest object in our current mission if we have one //Get our existing forest object in our current mission if we have one
%forestObject = parseMissionGroupForIds("Forest", ""); %forestObject = trim(parseMissionGroupForIds("Forest", ""));
if(isObject(%forestObject)) if(isObject(%forestObject))
{ {
ForestEditorGui.setActiveForest(%forestObject.getName()); ForestEditorGui.setActiveForest(%forestObject.getName());
@ -241,7 +241,7 @@ function ForestEditorPlugin::onSaveMission( %this, %missionFile )
ForestDataManager.saveDirty(); ForestDataManager.saveDirty();
//First, find out if we have an existing forest object //First, find out if we have an existing forest object
%forestObject = parseMissionGroupForIds("Forest", ""); %forestObject = trim(parseMissionGroupForIds("Forest", ""));
if ( isObject( %forestObject ) ) if ( isObject( %forestObject ) )
{ {

2
Templates/Full/game/tools/forestEditor/forestEditorGui.cs
View file

@ -50,7 +50,7 @@ function ForestEditorGui::onActiveForestUpdated( %this, %forest, %createNew )
/// Called from a message box when a forest is not found. /// Called from a message box when a forest is not found.
function ForestEditorGui::createForest( %this ) function ForestEditorGui::createForest( %this )
{ {
%forestObject = parseMissionGroupForIds("Forest", ""); %forestObject = trim(parseMissionGroupForIds("Forest", ""));
if ( isObject( %forestObject ) ) if ( isObject( %forestObject ) )
{ {

4
Templates/Full/game/tools/forestEditor/main.cs
View file

@ -143,7 +143,7 @@ function ForestEditorPlugin::onActivated( %this )
//ForestEditToolbar.setVisible( true ); //ForestEditToolbar.setVisible( true );
//Get our existing forest object in our current mission if we have one //Get our existing forest object in our current mission if we have one
%forestObject = parseMissionGroupForIds("Forest", ""); %forestObject = trim(parseMissionGroupForIds("Forest", ""));
if(isObject(%forestObject)) if(isObject(%forestObject))
{ {
ForestEditorGui.setActiveForest(%forestObject.getName()); ForestEditorGui.setActiveForest(%forestObject.getName());
@ -241,7 +241,7 @@ function ForestEditorPlugin::onSaveMission( %this, %missionFile )
ForestDataManager.saveDirty(); ForestDataManager.saveDirty();
//First, find out if we have an existing forest object //First, find out if we have an existing forest object
%forestObject = parseMissionGroupForIds("Forest", ""); %forestObject = trim(parseMissionGroupForIds("Forest", ""));
if ( isObject( %forestObject ) ) if ( isObject( %forestObject ) )
{ {