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

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
master
cutealien 2017-04-19 17:22:40 +00:00
parent d00ade6cbd
commit d3c91b659d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/Irrlicht/COctreeSceneNode.h
View File

@ -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

1
source/Irrlicht/Irrlicht-gcc.cbp
View File

@ -495,6 +495,7 @@
<Unit filename="../../include/IMeshTextureLoader.h" />
<Unit filename="../../include/IMeshWriter.h" />
<Unit filename="../../include/IMetaTriangleSelector.h" />
<Unit filename="../../include/IOctreeSceneNode.h" />
<Unit filename="../../include/IOSOperator.h" />
<Unit filename="../../include/IParticleAffector.h" />
<Unit filename="../../include/IParticleAnimatedMeshSceneNodeEmitter.h" />