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
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
--- a/source/Irrlicht/COGLES2Driver.cpp
+++ b/source/Irrlicht/COGLES2Driver.cpp
@@ -2635,7 +2635,7 @@ COGLES2Driver::~COGLES2Driver()
 			return UserClipPlane[index].Plane;
 		else
 		{
-			_IRR_DEBUG_BREAK_IF(true)	// invalid index
+			IRR_DEBUG_BREAK_IF(true)	// invalid index
 			static const core::plane3df dummy;
 			return dummy;
 		}