Skip to content

Commit e5e7600

Browse files
author
nitrocaster
committed
Maya_Export_2008: Fix conformance in For loop scope (#104).
1 parent 30cad26 commit e5e7600

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/editors/ECore/Editor/EditObjectIO.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ bool CEditableObject::Load(IReader& F)
284284

285285
// surfaces xrlc part
286286
if(F.find_chunk(EOBJ_CHUNK_SURFACES_XRLC))
287-
for (s_it=m_Surfaces.begin(); s_it!=m_Surfaces.end(); s_it++){
287+
for (SurfaceIt s_it = m_Surfaces.begin(); s_it!=m_Surfaces.end(); s_it++){
288288
F.r_stringZ(buf); (*s_it)->SetShaderXRLC(buf.c_str());
289289
}
290290
}

src/editors/ECore/Editor/ExportObjectOGF.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ bool CExportObjectOGF::ExportAsWavefrontOBJ(IWriter &F, LPCSTR fn)
569569
F.w_string(tmp);
570570

571571
u32 v_offs = 0;
572-
for (split_it = m_Splits.begin(); split_it!=m_Splits.end(); ++split_it)
572+
for (SplitIt split_it = m_Splits.begin(); split_it!=m_Splits.end(); ++split_it)
573573
{
574574
_splitpath((*split_it)->m_Surf->_Texture(), 0, 0, tex_name, 0);
575575
sprintf(tmp, "g %d", split_it-m_Splits.begin());

src/editors/ECore/Editor/ExportSkeleton.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -876,7 +876,7 @@ bool CExportSkeleton::ExportGeometry(IWriter &F, u8 infl)
876876
// OGF_CHILDREN
877877
F.open_chunk(OGF_CHILDREN);
878878
int chield = 0;
879-
for (split_it = m_Splits.begin(); split_it!=m_Splits.end(); split_it++)
879+
for (SplitIt split_it = m_Splits.begin(); split_it!=m_Splits.end(); split_it++)
880880
{
881881
F.open_chunk(chield++);
882882
split_it->Save(F);
@@ -905,7 +905,7 @@ bool CExportSkeleton::ExportGeometry(IWriter &F, u8 infl)
905905
bool bRes = true;
906906

907907
F.open_chunk(OGF_S_IKDATA);
908-
for (bone_it = m_Source->FirstBone(); bone_it!=m_Source->LastBone(); ++bone_it,++bone_idx)
908+
for (BoneIt bone_it = m_Source->FirstBone(); bone_it!=m_Source->LastBone(); ++bone_it,++bone_idx)
909909
if (!(*bone_it)->ExportOGF(F))
910910
bRes = false;
911911

@@ -1064,7 +1064,7 @@ bool CExportSkeleton::ExportMotionKeys(IWriter &F)
10641064
m_Source->CalculateRootObjectAnimation(ro_anchor);
10651065
}
10661066
bone_id = 0;
1067-
for (b_it = b_lst.begin(); b_it!=b_lst.end(); b_it++,bone_id++)
1067+
for (BoneIt b_it = b_lst.begin(); b_it!=b_lst.end(); b_it++,bone_id++)
10681068
{
10691069
CBone *B = *b_it;
10701070
Fmatrix mat = B->_MTransform();
@@ -1091,7 +1091,7 @@ bool CExportSkeleton::ExportMotionKeys(IWriter &F)
10911091
}
10921092
}
10931093
// free temp storage
1094-
for (itm_idx = 0; itm_idx<b_lst.size(); ++itm_idx)
1094+
for (u32 itm_idx = 0; itm_idx<b_lst.size(); ++itm_idx)
10951095
{
10961096
bm_item &BM = items[itm_idx];
10971097
// check T
@@ -1128,7 +1128,7 @@ bool CExportSkeleton::ExportMotionKeys(IWriter &F)
11281128
Msg("animation [%s] is 16bit-transform (%f)m", cur_motion->Name(), St.magnitude());
11291129
}
11301130

1131-
for (t_idx = 0; t_idx<dwLen; ++t_idx)
1131+
for (u32 t_idx = 0; t_idx<dwLen; ++t_idx)
11321132
{
11331133
Fvector &t = BM._keysT[t_idx];
11341134
CKeyQR &r = BM._keysQR[t_idx];

src/editors/ECore/WildMagic/RAPIDMinBox.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ BOOL RAPIDMinBox(Fobb& B, Fvector* vertices, u32 v_count)
241241
B.m_rotate.MTxV (c,vertices[0]);
242242
minval.set (c);
243243
maxval.set (c);
244-
for(i=0; i<v_count; i++){
244+
for(u32 i=0; i<v_count; i++){
245245
B.m_rotate.MTxV (c,vertices[i]);
246246
minmax (minval.x, maxval.x, c.x);
247247
minmax (minval.y, maxval.y, c.y);

0 commit comments

Comments
 (0)