1
0

Merging r6250 through r6254 from trunk to ogl-es branch

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

View File

@@ -512,9 +512,9 @@ public:
CBurningShader_Raster_Reference(CBurningVideoDriver* driver);
//! draws an indexed triangle list
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) _IRR_OVERRIDE_;
virtual void drawTriangle ( const s4DVertex *a,const s4DVertex *b,const s4DVertex *c ) IRR_OVERRIDE;
virtual void setMaterial ( const SBurningShaderMaterial &material ) _IRR_OVERRIDE_;
virtual void setMaterial ( const SBurningShaderMaterial &material ) IRR_OVERRIDE;
private: