sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: use checks for empty rather then size in the BGE

Browse Source
This commit is contained in:
Campbell Barton 2012-10-07 12:28:19 +00:00
parent 35f0ded377
commit aedf450746
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
View File

@ -147,7 +147,7 @@ void RAS_MeshSlot::begin(RAS_MeshSlot::iterator& it)
int startvertex, endvertex; int startvertex, endvertex;
int startindex, endindex; int startindex, endindex;
it.array = (m_displayArrays.size() > 0)? m_displayArrays[m_startarray]: NULL; it.array = m_displayArrays.empty() ? NULL : m_displayArrays[m_startarray];
if (it.array == NULL || it.array->m_index.size() == 0 || it.array->m_vertex.size() == 0) { if (it.array == NULL || it.array->m_index.size() == 0 || it.array->m_vertex.size() == 0) {
it.array = NULL; it.array = NULL;
@ -368,7 +368,7 @@ bool RAS_MeshSlot::Join(RAS_MeshSlot *target, MT_Scalar distance)
size_t i; size_t i;
// verify if we can join // verify if we can join
if (m_joinSlot || m_joinedSlots.size() || target->m_joinSlot) if (m_joinSlot || (m_joinedSlots.empty() == false) || target->m_joinSlot)
return false; return false;
if (!Equals(target)) if (!Equals(target))
@ -461,7 +461,7 @@ bool RAS_MeshSlot::Split(bool force)
abort(); abort();
} }
if (target->m_displayArrays.size()) { if (target->m_displayArrays.empty() == false) {
target->m_endvertex = target->m_displayArrays.back()->m_vertex.size(); target->m_endvertex = target->m_displayArrays.back()->m_vertex.size();
target->m_endindex = target->m_displayArrays.back()->m_index.size(); target->m_endindex = target->m_displayArrays.back()->m_index.size();
} }

2
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
View File

@ -359,7 +359,7 @@ void RAS_OpenGLRasterizer::ClearCachingInfo(void)
void RAS_OpenGLRasterizer::FlushDebugShapes() void RAS_OpenGLRasterizer::FlushDebugShapes()
{ {
if (!m_debugShapes.size()) if (m_debugShapes.empty())
return; return;
// DrawDebugLines // DrawDebugLines