minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-02-22 22:00:26 +01:00
Code Issues Projects Releases Wiki Activity

Add an important helper

Browse Source
This commit is contained in:
jordan4ibanez 2023-11-28 08:15:15 -05:00
parent 56857365f5
commit dbd40ba5bd
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/Irrlicht/CB3DJSONMeshFileLoader.cpp
View File

@ -220,6 +220,7 @@ std::tuple<bool, std::string> CB3DJSONMeshFileLoader::readChunkBRUS() {
/** /**
* Returns (success, failure reason). * Returns (success, failure reason).
* [optional]
*/ */
std::tuple<bool, std::string> CB3DJSONMeshFileLoader::readChunkTEXS() { std::tuple<bool, std::string> CB3DJSONMeshFileLoader::readChunkTEXS() {
@ -231,6 +232,12 @@ std::tuple<bool, std::string> CB3DJSONMeshFileLoader::readChunkTEXS() {
// We're referencing static memory. // We're referencing static memory.
texs = JSONDataContainer["TEXS"]; texs = JSONDataContainer["TEXS"];
} else { } else {
// We also want to warn developers if they're using {} instead of [].
if (JSONDataContainer.contains("TEXS") && !JSONDataContainer["TEXS"].is_array()) {
return {false, "TEXS is not an array."};
}
// Since it's optional, it succeeds if it's not there. // Since it's optional, it succeeds if it's not there.
return {true, ""}; return {true, ""};
} }