mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-29 16:25:42 +00:00
Corrects preload logic for projectiles to only fail if shape is specified, but failed to load
Corrects logic in Project Importer for if cubemapData is defined in material scripts, it can process them correctly.
This commit is contained in:
parent
47f2810e34
commit
0dddeeb6dd
2 changed files with 16 additions and 12 deletions
|
|
@ -218,7 +218,7 @@ function T3Dpre4ProjectImporter::beginMaterialFilesImport(%this)
|
|||
{
|
||||
%className = findObjectClass(%line, "new");
|
||||
|
||||
if(%className !$= "Material" && %className !$= "CustomMaterial" && %className !$= "TerrainMaterial")
|
||||
if(%className !$= "Material" && %className !$= "CustomMaterial" && %className !$= "TerrainMaterial" && %className !$= "CubemapData")
|
||||
{
|
||||
%lineNum++;
|
||||
%fileOutputLines.push_back(%line);
|
||||
|
|
@ -267,7 +267,7 @@ function T3Dpre4ProjectImporter::beginMaterialFilesImport(%this)
|
|||
{
|
||||
%className = findObjectClass(%line, "singleton");
|
||||
|
||||
if(%className !$= "Material" && %className !$= "CustomMaterial" && %className !$= "TerrainMaterial")
|
||||
if(%className !$= "Material" && %className !$= "CustomMaterial" && %className !$= "TerrainMaterial" && %className !$= "CubemapData")
|
||||
{
|
||||
%lineNum++;
|
||||
%fileOutputLines.push_back(%line);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue