mirror of
https://github.com/minetest/irrlicht.git
synced 2025-02-22 22:00:26 +01:00
And then fix this part
This commit is contained in:
parent
11e73fa99e
commit
bc79fe8722
@ -162,8 +162,6 @@ bool parseNode(json data, SMeshBuffer* meshBuffer) {
|
|||||||
*/
|
*/
|
||||||
std::tuple<bool, std::string> CB3DJSONMeshFileLoader::load() {
|
std::tuple<bool, std::string> CB3DJSONMeshFileLoader::load() {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Now check some real basic elements of the JSON file.
|
// Now check some real basic elements of the JSON file.
|
||||||
if (!JSONDataContainer.contains("format") || !JSONDataContainer["format"].is_string() || JSONDataContainer["format"] != "BB3D") {
|
if (!JSONDataContainer.contains("format") || !JSONDataContainer["format"].is_string() || JSONDataContainer["format"] != "BB3D") {
|
||||||
return {false, "No format in B3D JSON! Expected: BB3D"};
|
return {false, "No format in B3D JSON! Expected: BB3D"};
|
||||||
@ -195,7 +193,7 @@ std::tuple<bool, std::string> CB3DJSONMeshFileLoader::load() {
|
|||||||
// animatedMesh->addMesh(baseMesh);
|
// animatedMesh->addMesh(baseMesh);
|
||||||
|
|
||||||
// return animatedMesh;
|
// return animatedMesh;
|
||||||
return true;
|
return {true, nullptr};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
x
Reference in New Issue
Block a user