zaki
/
irrlicht
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable broken cubescenenodes again. 

In r5805 they got broken when adding compile-flags for them.
Copy-paste error, define was missing a '_' at the end in some places, sorry.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5810 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2019-05-01 10:32:24 +00:00
parent b3a156b1bb
commit 278f5f14e4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/Irrlicht/CCubeSceneNode.cpp
View File

@ -3,7 +3,7 @@
// For conditions of distribution and use, see copyright notice in irrlicht.h
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_CUBE_SCENENODE
#ifdef _IRR_COMPILE_WITH_CUBE_SCENENODE_
#include "CCubeSceneNode.h"
#include "IVideoDriver.h"
#include "ISceneManager.h"
@ -243,4 +243,4 @@ ISceneNode* CCubeSceneNode::clone(ISceneNode* newParent, ISceneManager* newManag
} // end namespace scene
} // end namespace irr
#endif // _IRR_COMPILE_WITH_CUBE_SCENENODE
#endif // _IRR_COMPILE_WITH_CUBE_SCENENODE_

6
source/Irrlicht/CSceneManager.cpp
View File

@ -138,9 +138,9 @@
#include "CB3DMeshWriter.h"
#endif
#ifdef _IRR_COMPILE_WITH_CUBE_SCENENODE
#ifdef _IRR_COMPILE_WITH_CUBE_SCENENODE_
#include "CCubeSceneNode.h"
#endif // _IRR_COMPILE_WITH_CUBE_SCENENODE
#endif // _IRR_COMPILE_WITH_CUBE_SCENENODE_
#ifdef _IRR_COMPILE_WITH_SPHERE_SCENENODE_
#include "CSphereSceneNode.h"
#endif
@ -604,7 +604,7 @@ IMeshSceneNode* CSceneManager::addCubeSceneNode(f32 size, ISceneNode* parent,
s32 id, const core::vector3df& position,
const core::vector3df& rotation, const core::vector3df& scale)
{
#ifdef _IRR_COMPILE_WITH_CUBE_SCENENODE
#ifdef _IRR_COMPILE_WITH_CUBE_SCENENODE_
if (!parent)
parent = this;