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:
@@ -670,7 +670,7 @@ video::ITexture* CNullDriver::loadTextureFromFile(io::IReadFile* file, const io:
|
||||
}
|
||||
break;
|
||||
default:
|
||||
_IRR_DEBUG_BREAK_IF(true);
|
||||
IRR_DEBUG_BREAK_IF(true);
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -1141,7 +1141,7 @@ const SLight& CNullDriver::getDynamicLight(u32 idx) const
|
||||
return Lights[idx];
|
||||
else
|
||||
{
|
||||
_IRR_DEBUG_BREAK_IF(true)
|
||||
IRR_DEBUG_BREAK_IF(true)
|
||||
static const SLight dummy;
|
||||
return dummy;
|
||||
}
|
||||
|
Reference in New Issue
Block a user