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/Sandbox/Editor/Material/MaterialPythonFuncs.cpp
+4 -4
View File
@@ -1353,9 +1353,9 @@ namespace
}
else
{
uint16 nSlot = aznumeric_cast<uint16>(TryConvertingCStringToEEfResTextures(subCategoryName));
AZ_Warning("ShadersSystem", false, "PyGetProperty - Error: empty 'subCategoryName' texture slot [%d] for material %s",
nSlot, pMaterial->GetName().toStdString().c_str());
aznumeric_cast<uint16>(TryConvertingCStringToEEfResTextures(subCategoryName)),
pMaterial->GetName().toStdString().c_str());
}
}
// ########## Texture Maps / [Tiling | Rotator | Oscillator] ##########
@@ -1485,9 +1485,9 @@ namespace
}
else
{
uint16 nSlot = aznumeric_cast<uint16>(TryConvertingCStringToEEfResTextures(subSubCategoryName));
AZ_Warning("ShadersSystem", false, "PyGetProperty - Error: empty 'subSubCategoryName' texture slot [%d] for material %s",
nSlot, pMaterial->GetName().toStdString().c_str());
aznumeric_cast<uint16>(TryConvertingCStringToEEfResTextures(subSubCategoryName)),
pMaterial->GetName().toStdString().c_str());
}
}
else