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

Merge branch 'Assimp_Settings' of https://github.com/OTHGMars/Torque3D into Preview4_0

Browse source
This commit is contained in:
Areloch 2019-05-25 01:08:16 -05:00
commit cc01c79dc3
25 changed files with 4541 additions and 1508 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Templates/BaseGame/game/tools/shapeEditor/gui/shapeEdSelectWindow.ed.gui
View file

@ -489,14 +489,14 @@
Profile = "ToolsGuiCheckBoxProfile";
HorizSizing = "left";
VertSizing = "bottom";
Position = "135 27";
Position = "133 27";
Extent = "72 13";
Variable = "EWorldEditor.forceLoadDAE";
Command = "EWorldEditor.forceLoadDAE = $ThisControl.getValue(); EditorSettings.setValue(\"forceLoadDAE\", EWorldEditor.forceLoadDAE);";
tooltipprofile = "ToolsGuiToolTipProfile";
ToolTip = "Forces loading of DAE files (ignores cached.dts if present)";
hovertime = "1000";
text = " Force DAE";
text = " Source Art";
};
};

3
Templates/BaseGame/game/tools/shapeEditor/scripts/shapeEditor.ed.cs
View file

@ -227,6 +227,9 @@ function ShapeEditor::saveChanges( %this )
function ShapeEditor::findConstructor( %this, %path )
{
if (!isObject(TSShapeConstructorGroup))
return -1;
%count = TSShapeConstructorGroup.getCount();
for ( %i = 0; %i < %count; %i++ )
{