birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating github/staging through commit ab87ed9

Browse Source
This commit is contained in:
alexpete
2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/CryEngine/RenderDll/Common/Shaders/ShaderTemplate.cpp
+4 -3
View File
@@ -813,7 +813,8 @@ CTexAnim* CShaderMan::mfReadTexSequence(const char* na, int Flags, [[maybe_unuse
{
name[nm - nName] = 0;
char* speed = &nName[nm - nName + 1];
if (nm = strchr(speed, ')'))
nm = strchr(speed, ')');
if (nm)
{
speed[nm - speed] = 0;
}
@@ -912,7 +913,6 @@ CTexAnim* CShaderMan::mfReadTexSequence(const char* na, int Flags, [[maybe_unuse
ta->m_Time = fSpeed;
}
ITexture* pTex = (ITexture*)tp;
ta->m_TexPics.AddElem(tp);
n++;
}
@@ -1048,7 +1048,8 @@ bool CShaderMan::mfLoadResourceTexture(ResourceSlotIndex Id, CShaderResources& R
TextureWarning(pTextureRes->m_Name.c_str(), "Texture file is missing: '%s%s' in material \'%s\'", RS.m_TexturePath.c_str(), pTextureRes->m_Name.c_str(), RS.m_szMaterialName);
}
if (!(bTextureLoaded = texSampler.m_pTex->IsTextureLoaded()) && bReplaceMeOnFail)
bTextureLoaded = texSampler.m_pTex->IsTextureLoaded();
if (!bTextureLoaded && bReplaceMeOnFail)
{
texSampler.m_pTex = mfLoadResourceTexture("EngineAssets/TextureMsg/ReplaceMe.tif", RS.m_TexturePath.c_str(), texSampler.GetTexFlags() | CustomFlags, pTextureRes);
}