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 dev

Browse source
This commit is contained in:
marauder2k7 2024-12-27 15:25:02 +00:00
parent 0f4d2d1689
commit d87655bb3a
3 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Engine/source/materials/materialDefinition.cpp
View file

@ -230,12 +230,6 @@ Material::Material()
mReverbSoundOcclusion = 1.0;
}
void Material::onImageAssetChanged()
{
flush();
reload();
}
void Material::initPersistFields()
{
docsURL;

4
Engine/source/materials/processedMaterial.cpp
View file

@ -398,8 +398,8 @@ void ProcessedMaterial::_setStageData()
if (!mStages[i].getTex(MFT_DiffuseMap))
{
// If we start with a #, we're probably actually attempting to hit a named target and it may not get a hit on the first pass.
if (!String(mMaterial->mDiffuseMapAsset[i]->getImageFileName()).startsWith("#") && !String(mMaterial->mDiffuseMapAsset[i]->getImageFileName()).startsWith("$"))
mMaterial->logError("Failed to load diffuse map %s for stage %i", mMaterial->mDiffuseMapAsset[i]->getImageFileName(), i);
if (!String(mMaterial->getDiffuseMapAsset(i)->getImageFile()).startsWith("#") && !String(mMaterial->getDiffuseMapAsset(i)->getImageFile()).startsWith("$"))
mMaterial->logError("Failed to load diffuse map %s for stage %i", mMaterial->getDiffuseMapAsset(i)->getImageFile(), i);
mStages[i].setTex(MFT_DiffuseMap, _createTexture(GFXTextureManager::getMissingTexturePath().c_str(), &GFXStaticTextureSRGBProfile));
}