TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 14:00:39 +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

6
Engine/source/T3D/assets/MaterialAsset.cpp
View file

@ -90,8 +90,8 @@ ConsoleSetType(TypeMaterialAssetPtr)
MaterialAsset::MaterialAsset()
{
mShaderGraphFile = "";
mScriptFile = "";
mMatDefinitionName = "";
mScriptFile = StringTable->EmptyString();
mMatDefinitionName = StringTable->EmptyString();
}
//-----------------------------------------------------------------------------
@ -111,7 +111,7 @@ void MaterialAsset::initPersistFields()
addProtectedField("scriptFile", TypeAssetLooseFilePath, Offset(mScriptFile, MaterialAsset),
&setScriptFile, &getScriptFile, "Path to the file containing the material definition.");
addField("materialDefinitionName", TypeRealString, Offset(mMatDefinitionName, MaterialAsset), "Name of the material definition this asset is for.");
addField("materialDefinitionName", TypeString, Offset(mMatDefinitionName, MaterialAsset), "Name of the material definition this asset is for.");
}
void MaterialAsset::initializeAsset()