Maya_Export_2008: Fix conformance in For loop scope (#104).

OpenXRay · Jan 16, 2016 · e5e7600 · e5e7600
1 parent 30cad26
commit e5e7600
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/editors/ECore/Editor/EditObjectIO.cpp b/src/editors/ECore/Editor/EditObjectIO.cpp
@@ -284,7 +284,7 @@ bool CEditableObject::Load(IReader& F)
 
 // surfaces xrlc part
 			if(F.find_chunk(EOBJ_CHUNK_SURFACES_XRLC))
-				for (s_it=m_Surfaces.begin(); s_it!=m_Surfaces.end(); s_it++){
+				for (SurfaceIt s_it = m_Surfaces.begin(); s_it!=m_Surfaces.end(); s_it++){
 					F.r_stringZ(buf); (*s_it)->SetShaderXRLC(buf.c_str());
 				}
 		}

diff --git a/src/editors/ECore/Editor/ExportObjectOGF.cpp b/src/editors/ECore/Editor/ExportObjectOGF.cpp
@@ -569,7 +569,7 @@ bool CExportObjectOGF::ExportAsWavefrontOBJ(IWriter &F, LPCSTR fn)
     F.w_string(tmp);
 
     u32 v_offs = 0;
-    for (split_it = m_Splits.begin(); split_it!=m_Splits.end(); ++split_it)
+    for (SplitIt split_it = m_Splits.begin(); split_it!=m_Splits.end(); ++split_it)
     {
         _splitpath((*split_it)->m_Surf->_Texture(), 0, 0, tex_name, 0);
         sprintf(tmp, "g %d", split_it-m_Splits.begin());

diff --git a/src/editors/ECore/Editor/ExportSkeleton.cpp b/src/editors/ECore/Editor/ExportSkeleton.cpp
@@ -876,7 +876,7 @@ bool CExportSkeleton::ExportGeometry(IWriter &F, u8 infl)
     // OGF_CHILDREN
     F.open_chunk(OGF_CHILDREN);
     int chield = 0;
-    for (split_it = m_Splits.begin(); split_it!=m_Splits.end(); split_it++)
+    for (SplitIt split_it = m_Splits.begin(); split_it!=m_Splits.end(); split_it++)
     {
         F.open_chunk(chield++);
         split_it->Save(F);
@@ -905,7 +905,7 @@ bool CExportSkeleton::ExportGeometry(IWriter &F, u8 infl)
     bool bRes = true;
 
     F.open_chunk(OGF_S_IKDATA);
-    for (bone_it = m_Source->FirstBone(); bone_it!=m_Source->LastBone(); ++bone_it,++bone_idx)
+    for (BoneIt bone_it = m_Source->FirstBone(); bone_it!=m_Source->LastBone(); ++bone_it,++bone_idx)
         if (!(*bone_it)->ExportOGF(F))
             bRes = false;
 
@@ -1064,7 +1064,7 @@ bool CExportSkeleton::ExportMotionKeys(IWriter &F)
                 m_Source->CalculateRootObjectAnimation(ro_anchor);
             }
             bone_id = 0;
-            for (b_it = b_lst.begin(); b_it!=b_lst.end(); b_it++,bone_id++)
+            for (BoneIt b_it = b_lst.begin(); b_it!=b_lst.end(); b_it++,bone_id++)
             {
                 CBone *B = *b_it;
                 Fmatrix mat = B->_MTransform();
@@ -1091,7 +1091,7 @@ bool CExportSkeleton::ExportMotionKeys(IWriter &F)
             }
         }
         // free temp storage
-        for (itm_idx = 0; itm_idx<b_lst.size(); ++itm_idx)
+        for (u32 itm_idx = 0; itm_idx<b_lst.size(); ++itm_idx)
         {
             bm_item &BM = items[itm_idx];
             // check T
@@ -1128,7 +1128,7 @@ bool CExportSkeleton::ExportMotionKeys(IWriter &F)
                 Msg("animation [%s] is 16bit-transform (%f)m", cur_motion->Name(), St.magnitude());
             }
 
-            for (t_idx = 0; t_idx<dwLen; ++t_idx)
+            for (u32 t_idx = 0; t_idx<dwLen; ++t_idx)
             {
                 Fvector &t = BM._keysT[t_idx];
                 CKeyQR &r = BM._keysQR[t_idx];

diff --git a/src/editors/ECore/WildMagic/RAPIDMinBox.cpp b/src/editors/ECore/WildMagic/RAPIDMinBox.cpp
@@ -241,7 +241,7 @@ BOOL RAPIDMinBox(Fobb& B, Fvector* vertices, u32 v_count)
     B.m_rotate.MTxV		(c,vertices[0]);
     minval.set			(c);
     maxval.set			(c);
-	for(i=0; i<v_count; i++){
+	for(u32 i=0; i<v_count; i++){
 	    B.m_rotate.MTxV	(c,vertices[i]);
 		minmax			(minval.x, maxval.x, c.x);
 		minmax			(minval.y, maxval.y, c.y);