TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 11:43:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'devhead/Preview4_0' into tsneo

Browse source
This commit is contained in:
Jeff Hutchinson 2021-08-30 19:39:06 -04:00
commit 485330ec7a
6 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/projectImporter/scripts/pre40/T3Dpre4ProjectImporter.tscript
View file

@ -235,6 +235,7 @@ function T3Dpre4ProjectImporter::beginMaterialFilesImport(%this)
if(strIsMatchExpr("*new*(*)*", %line) && strpos(%line, "::") == -1)
{
%className = findObjectClass(%line, "new");
if (%className $= "") continue;
if(%className !$= "Material" && %className !$= "CustomMaterial" && %className !$= "TerrainMaterial" && %className !$= "CubemapData")
{
@ -463,6 +464,7 @@ function T3Dpre4ProjectImporter::beginCodeFilesImport(%this)
if(strIsMatchExpr("*new*(*)*", %line) && strpos(%line, "::") == -1)
{
%className = findObjectClass(%line, "new");
if (%className $= "") continue;
%objectClassStack.push_back(%className);