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

Merge branch 'VerveMergeWIP' of https://github.com/Areloch/Torque3D into development

Browse source
This commit is contained in:
Areloch 2019-05-06 01:49:58 -05:00
commit 82c74b4511
549 changed files with 68656 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/T3D/assets/MaterialAsset.h
View file

@ -56,7 +56,7 @@ class MaterialAsset : public AssetBase
typedef AssetBase Parent;
String mShaderGraphFile;
String mScriptFile;
StringTableEntry mScriptFile;
StringTableEntry mMatDefinitionName;
public: