luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/Irrlicht/CColladaFileLoader.cpp
View File

@@ -143,14 +143,14 @@ namespace
//! creates an instance of this prefab
virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent,
scene::ISceneManager* mgr) _IRR_OVERRIDE_
scene::ISceneManager* mgr) IRR_OVERRIDE
{
// empty implementation
return 0;
}
//! returns id of this prefab
virtual const core::stringc& getId() _IRR_OVERRIDE_
virtual const core::stringc& getId() IRR_OVERRIDE
{
return Id;
}
@@ -177,7 +177,7 @@ namespace
//! creates an instance of this prefab
virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent,
scene::ISceneManager* mgr) _IRR_OVERRIDE_
scene::ISceneManager* mgr) IRR_OVERRIDE
{
#ifdef COLLADA_READER_DEBUG
os::Printer::log("COLLADA: Constructing light instance", Id.c_str(), ELL_DEBUG);
@@ -213,7 +213,7 @@ namespace
//! creates an instance of this prefab
virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent,
scene::ISceneManager* mgr) _IRR_OVERRIDE_
scene::ISceneManager* mgr) IRR_OVERRIDE
{
#ifdef COLLADA_READER_DEBUG
os::Printer::log("COLLADA: Constructing mesh instance", Id.c_str(), ELL_DEBUG);
@@ -251,7 +251,7 @@ namespace
//! creates an instance of this prefab
virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent,
scene::ISceneManager* mgr) _IRR_OVERRIDE_
scene::ISceneManager* mgr) IRR_OVERRIDE
{
#ifdef COLLADA_READER_DEBUG
os::Printer::log("COLLADA: Constructing camera instance", Id.c_str(), ELL_DEBUG);
@@ -285,7 +285,7 @@ namespace
//! creates an instance of this prefab
virtual scene::ISceneNode* addInstance(scene::ISceneNode* parent,
scene::ISceneManager* mgr) _IRR_OVERRIDE_
scene::ISceneManager* mgr) IRR_OVERRIDE
{
#ifdef COLLADA_READER_DEBUG
os::Printer::log("COLLADA: Constructing scene instance", Id.c_str(), ELL_DEBUG);