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

Merge branch 'Preview4_0_DevHead' into tsneo

Browse source
This commit is contained in:
Jeff Hutchinson 2021-08-16 22:50:02 -04:00
commit ada1c5a021
521 changed files with 259 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.tscript
View file

@ -3369,7 +3369,7 @@ function ShapeEdMountWindow::mountShape( %this, %slot )
%type = %this-->mountType.getText();
if ( %model $= "Browse..." )
%model = "core/shapes/octahedron.dts";
%model = "core/gameObjects/shapes/octahedron.dts";
if ( ShapeEdShapeView.mountShape( %model, %node, %type, %slot ) )
{