minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2024-09-27 23:10:25 +02:00
Code Issues Projects Releases Wiki Activity

Make it so we can inline this

Browse Source
This commit is contained in:
jordan4ibanez 2023-11-28 05:09:46 -05:00
parent b4233a513b
commit ec907d8771
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/Irrlicht/CB3DJSONMeshFileLoader.cpp
View File

@ -185,10 +185,11 @@ bool load(json data) {
return true; return true;
} }
void CB3DJSONMeshFileLoader::cleanUp(std::string failure) { CSkinnedMesh* CB3DJSONMeshFileLoader::cleanUp(std::string failure) {
os::Printer::log(failure.c_str(), ELL_WARNING); os::Printer::log(failure.c_str(), ELL_WARNING);
AnimatedMesh->drop(); AnimatedMesh->drop();
AnimatedMesh = 0; AnimatedMesh = 0;
return AnimatedMesh;
} }
/** /**
@ -218,6 +219,8 @@ bool CB3DJSONMeshFileLoader::parseJSONFile(io::IReadFile* file) {
os::Printer::log("JSON: Failed to parse!", ELL_WARNING); os::Printer::log("JSON: Failed to parse!", ELL_WARNING);
return false; return false;
} }
// I'm not sure if buffer and output gets dropped here.
return true; return true;
} }

2
source/Irrlicht/CB3DJSONMeshFileLoader.h
View File

@ -27,7 +27,7 @@ private:
json JSONDataContainer; json JSONDataContainer;
// Methods. // Methods.
void cleanUp(std::string); CSkinnedMesh* cleanUp(std::string);
bool parseJSONFile(io::IReadFile* file); bool parseJSONFile(io::IReadFile* file);
public: public: