[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51145] trunk/blender/source/gameengine/ Rasterizer: code cleanup: use checks for empty rather then size in the BGE

Campbell Barton ideasman42 at gmail.com
Sun Oct 7 14:28:19 CEST 2012


Revision: 51145
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51145
Author:   campbellbarton
Date:     2012-10-07 12:28:19 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
code cleanup: use checks for empty rather then size in the BGE

Modified Paths:
--------------
    trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp	2012-10-07 11:55:49 UTC (rev 51144)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp	2012-10-07 12:28:19 UTC (rev 51145)
@@ -147,7 +147,7 @@
 	int startvertex, endvertex;
 	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) {
 		it.array = NULL;
@@ -368,7 +368,7 @@
 	size_t i;
 
 	// 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;
 
 	if (!Equals(target))
@@ -461,7 +461,7 @@
 				abort();
 		}
 
-		if (target->m_displayArrays.size()) {
+		if (target->m_displayArrays.empty() == false) {
 			target->m_endvertex = target->m_displayArrays.back()->m_vertex.size();
 			target->m_endindex = target->m_displayArrays.back()->m_index.size();
 		}

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp	2012-10-07 11:55:49 UTC (rev 51144)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp	2012-10-07 12:28:19 UTC (rev 51145)
@@ -359,7 +359,7 @@
 
 void RAS_OpenGLRasterizer::FlushDebugShapes()
 {
-	if (!m_debugShapes.size())
+	if (m_debugShapes.empty())
 		return;
 
 	// DrawDebugLines




More information about the Bf-blender-cvs mailing list