From 278f5f14e4811d5fa08a49de1e48e1069a4285d1 Mon Sep 17 00:00:00 2001 From: cutealien Date: Wed, 1 May 2019 10:32:24 +0000 Subject: [PATCH] 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 --- source/Irrlicht/CCubeSceneNode.cpp | 4 ++-- source/Irrlicht/CSceneManager.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/Irrlicht/CCubeSceneNode.cpp b/source/Irrlicht/CCubeSceneNode.cpp index 0e00da95..0400c116 100644 --- a/source/Irrlicht/CCubeSceneNode.cpp +++ b/source/Irrlicht/CCubeSceneNode.cpp @@ -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_ diff --git a/source/Irrlicht/CSceneManager.cpp b/source/Irrlicht/CSceneManager.cpp index c3c7e2ee..2c1af0ad 100644 --- a/source/Irrlicht/CSceneManager.cpp +++ b/source/Irrlicht/CSceneManager.cpp @@ -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;