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

Fixes handling in the generic creator function to deal with commands formatted with "return " at the start AND without

Browse source 
Fixes assignment of default material to convex shape when the toolbar button is pressed to create a 1u cube automatically.
This commit is contained in:
JeffR 2021-12-25 12:30:31 -06:00
parent c7342cc64f
commit cde1d68f78
2 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript
View file

@ -51,6 +51,8 @@ function ConvexEditorGui::onSleep( %this )
function ConvexEditorGui::createConvexBox( %this ) function ConvexEditorGui::createConvexBox( %this )
{ {
%obj = genericCreateObject( "ConvexShape" ); %obj = genericCreateObject( "ConvexShape" );
%obj.setMaterial(%this.materialName); //set whatever the editor has as it's default material to the new one
%this.handleDeselect(); %this.handleDeselect();
%this.selectConvex( %obj ); %this.selectConvex( %obj );
%this.dropSelectionAtScreenCenter(); %this.dropSelectionAtScreenCenter();

4
Templates/BaseGame/game/tools/worldEditor/scripts/editors/creator.ed.tscript
View file

@ -227,6 +227,10 @@ function ObjectCreator::createObject( %this, %cmd )
%this.setNewObjectGroup( getScene(0) ); %this.setNewObjectGroup( getScene(0) );
pushInstantGroup(); pushInstantGroup();
if(startsWith(%cmd, "return "))
%objId = eval(%cmd);
else
%objId = eval("return " @ %cmd); %objId = eval("return " @ %cmd);
popInstantGroup(); popInstantGroup();