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

* BugFix: Clear a lot of warnings and correct a few actual programming errors along the way.

Browse source
This commit is contained in:
Robert MacGregor 2021-10-04 20:04:21 -04:00
parent ef514d0e6b
commit 1b6b803a20
61 changed files with 120 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,7 +19,6 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
// IN THE SOFTWARE.
//-----------------------------------------------------------------------------
#pragma once
#ifndef MATERIALASSET_H
#include "MaterialAsset.h"
@ -171,10 +170,16 @@ void MaterialAsset::initializeAsset()
if (Torque::FS::IsScriptFile(mScriptPath))
{
if (!Sim::findObject(mMatDefinitionName))
if (Con::executeFile(mScriptPath, false, false))
mLoadedState = ScriptLoaded;
else
mLoadedState = Failed;
{
if (Con::executeFile(mScriptPath, false, false))
{
mLoadedState = ScriptLoaded;
}
else
{
mLoadedState = Failed;
}
}
}
loadMaterial();