From d3c91b659d1f82f817c2c2cc1c6bd29f4bd089e3 Mon Sep 17 00:00:00 2001 From: cutealien Date: Wed, 19 Apr 2017 17:22:40 +0000 Subject: [PATCH] Merge revisions r5438:r5439 from trunk to ogl-es git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@5440 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/COctreeSceneNode.h | 4 ++-- source/Irrlicht/Irrlicht-gcc.cbp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/Irrlicht/COctreeSceneNode.h b/source/Irrlicht/COctreeSceneNode.h index 3d1ff88d..87509869 100644 --- a/source/Irrlicht/COctreeSceneNode.h +++ b/source/Irrlicht/COctreeSceneNode.h @@ -39,7 +39,7 @@ namespace scene //! returns the material based on the zero based index i. To get the amount //! of materials used by this scene node, use getMaterialCount(). - //! This function is needed for inserting the node into the scene hirachy on a + //! This function is needed for inserting the node into the scene hierarchy on a //! optimal position for minimizing renderstate changes, but can also be used //! to directly modify the material of a scene node. virtual video::SMaterial& getMaterial(u32 i) _IRR_OVERRIDE_; @@ -75,7 +75,7 @@ namespace scene //! Removes a child from this scene node. //! Implemented here, to be able to remove the shadow properly, if there is one, - //! or to remove attached childs. + //! or to remove attached children. virtual bool removeChild(ISceneNode* child) _IRR_OVERRIDE_; //! Set if/how vertex buffer object are used for the meshbuffers diff --git a/source/Irrlicht/Irrlicht-gcc.cbp b/source/Irrlicht/Irrlicht-gcc.cbp index 31157a8b..b87aad2c 100644 --- a/source/Irrlicht/Irrlicht-gcc.cbp +++ b/source/Irrlicht/Irrlicht-gcc.cbp @@ -495,6 +495,7 @@ +