[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27736] trunk/blender/source/gameengine/ Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp: Fix compilation error in MinGW with my last commit.

[Benoit Bolsee]

Revision: 27736
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27736
Author:   ben2610
Date:     2010-03-25 09:48:31 +0100 (Thu, 25 Mar 2010)

Log Message:
-----------
Fix compilation error in MinGW with my last commit.

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

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp	2010-03-25 06:27:25 UTC (rev 27735)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp	2010-03-25 08:48:31 UTC (rev 27736)
@@ -25,8 +25,8 @@
 :	KX_ListSlot(),
 	m_list(0),
 	m_flag(LIST_MODIFY|LIST_CREATE),
-	m_rasty(rasty),
-	m_matnr(0)
+	m_matnr(0),
+	m_rasty(rasty)
 {
 }
 
@@ -166,24 +166,25 @@
 			// that means that we draw based on derived mesh, a display list is possible
 			// Note that we come here only for static derived mesh
 			int matnr = ms.m_bucket->GetPolyMaterial()->GetMaterialIndex();
+			RAS_ListSlot* nullSlot = NULL;
 			RAS_ListSlots *listVector;
 			RAS_DerivedMeshLists::iterator it = mDerivedMeshLists.find(ms.m_pDerivedMesh);
 			if(it == mDerivedMeshLists.end()) {
-				listVector = new RAS_ListSlots(matnr+4, NULL);
+				listVector = new RAS_ListSlots(matnr+4, nullSlot);
 				localSlot = new RAS_ListSlot(this);
 				localSlot->m_flag |= LIST_DERIVEDMESH;
 				localSlot->m_matnr = matnr;
-				(*listVector)[matnr] = localSlot;
+				listVector->at(matnr) = localSlot;
 				mDerivedMeshLists.insert(std::pair<DerivedMesh*, RAS_ListSlots*>(ms.m_pDerivedMesh, listVector));
 			} else {
 				listVector = it->second;
 				if (listVector->size() <= matnr)
-					listVector->resize(matnr+4, NULL);
+					listVector->resize(matnr+4, nullSlot);
 				if ((localSlot = listVector->at(matnr)) == NULL) {
 					localSlot = new RAS_ListSlot(this);
 					localSlot->m_flag |= LIST_DERIVEDMESH;
 					localSlot->m_matnr = matnr;
-					(*listVector)[matnr] = localSlot;
+					listVector->at(matnr) = localSlot;
 				} else {
 					localSlot->AddRef();
 				}