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

Added changes missed via merge failures.

Browse source 
Removed some unused files/references that were causing errors, related to issues #502 & #512
This commit is contained in:
Areloch 2021-07-20 20:05:49 -05:00
parent 5525f8ecdd
commit 3e131f5b8e
78 changed files with 1812 additions and 1832 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/assetBrowser/scripts/editAsset.tscript
View file

@ -28,7 +28,7 @@ function AssetBrowser::editAsset(%this, %assetDef)
}
}
}
else if(!isObject(%assetDef) && strchrpos(%assetDef, ":") != -1)
else if(AssetDatabase.isDeclaredAsset(%assetDef))
{
//Turns out we were passed an assetid, not an asset definition.
//Grab the asset def from that