TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-03 04:20:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #799 from Areloch/MiscFixes20220530

Browse source 
Misc Fixes for 2022/05/30
This commit is contained in:
Brian Roberts 2022-05-31 14:33:59 -05:00 • committed by GitHub
commit d9361a0128
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
98 changed files with 1274 additions and 1725 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Engine/source/terrain/terrMaterial.cpp
View file

@ -199,15 +199,15 @@ TerrainMaterial* TerrainMaterial::findOrCreate( const char *nameOrPath )
}
// Ok... return a placeholder material then.
mat = new TerrainMaterial();
mat = new TerrainMaterial();
mat->setInternalName(nameOrPath);
mat->_setDiffuseMap(GFXTextureManager::getWarningTexturePath());
mat->mDiffuseSize = 500;
mat->_setDetailMap(StringTable->EmptyString());
mat->mDetailSize = 5;
mat->_setMacroMap(StringTable->EmptyString());
mat->mMacroSize = 200;
mat->registerObject();
mat->_setDiffuseMap(GFXTextureManager::getWarningTexturePath());
mat->mDiffuseSize = 500;
mat->_setDetailMap(StringTable->EmptyString());
mat->mDetailSize = 5;
mat->_setMacroMap(StringTable->EmptyString());
mat->mMacroSize = 200;
mat->registerObject();
Sim::getRootGroup()->addObject(mat);