Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Warnings] Fix signed/unsigned mismatches rather than disabling 4018

Browse Source
This commit is contained in:
Inusaito Sayori
2013-10-05 18:23:13 -04:00
parent eeeca2197e
commit 23e72f3978
2 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/daeexport.cpp
View File

@@ -27,7 +27,6 @@
//colladadom includes
#if LL_MSVC
#pragma warning (disable : 4018)
#pragma warning (push)
#pragma warning (disable : 4068)
#pragma warning (disable : 4263)
@@ -358,7 +357,7 @@ public:
scroll_container->addChild(panel);
panel->setEnabled(FALSE);
S32 img_nr = 0;
for (S32 i=0; i < mSaver.mTextures.size(); i++)
for (U32 i=0; i < mSaver.mTextures.size(); i++)
{
if (mSaver.mTextureNames[i].empty()) continue;
@@ -375,7 +374,7 @@ public:
void saveTextures()
{
mTexturesToSave.clear();
for (S32 i=0; i < mSaver.mTextures.size(); i++)
for (U32 i=0; i < mSaver.mTextures.size(); i++)
{
if (mSaver.mTextureNames[i].empty()) continue;
mTexturesToSave[mSaver.mTextures[i]] = mSaver.mTextureNames[i];
@@ -613,7 +612,7 @@ void DAESaver::addSource(daeElement* mesh, const char* src_id, std::string param
src_array->setAttribute("id", llformat("%s-%s", src_id, "array").c_str());
src_array->setAttribute("count", llformat("%d", vals.size()).c_str());
for (S32 i = 0; i < vals.size(); i++)
for (U32 i = 0; i < vals.size(); i++)
{
((domFloat_array*)src_array)->getValue().append(vals[i]);
}
@@ -870,7 +869,7 @@ bool DAESaver::saveDAE(std::string filename)
// Add triangles
if (gSavedSettings.getBOOL("DAEExportConsolidateMaterials"))
{
for (S32 objMaterial = 0; objMaterial < objMaterials.size(); objMaterial++)
for (U32 objMaterial = 0; objMaterial < objMaterials.size(); objMaterial++)
{
int_list_t faces;
getFacesWithMaterial(obj, objMaterials[objMaterial], &faces);
@@ -913,7 +912,7 @@ bool DAESaver::saveDAE(std::string filename)
// Bind materials
daeElement* tq = nodeGeometry->add("bind_material technique_common");
for (S32 objMaterial = 0; objMaterial < objMaterials.size(); objMaterial++)
for (U32 objMaterial = 0; objMaterial < objMaterials.size(); objMaterial++)
{
std::string matName = objMaterials[objMaterial].name;
daeElement* instanceMaterial = tq->add("instance_material");
@@ -929,7 +928,7 @@ bool DAESaver::saveDAE(std::string filename)
generateEffects(effects);
// Materials
for (S32 objMaterial = 0; objMaterial < mAllMaterials.size(); objMaterial++)
for (U32 objMaterial = 0; objMaterial < mAllMaterials.size(); objMaterial++)
{
daeElement* mat = materials->add("material");
mat->setAttribute("id", (mAllMaterials[objMaterial].name + "-material").c_str());
@@ -955,7 +954,7 @@ DAESaver::MaterialInfo DAESaver::getMaterial(LLTextureEntry* te)
{
if (gSavedSettings.getBOOL("DAEExportConsolidateMaterials"))
{
for (S32 i=0; i < mAllMaterials.size(); i++)
for (U32 i=0; i < mAllMaterials.size(); i++)
{
if (mAllMaterials[i].matches(te))
{
@@ -1010,7 +1009,7 @@ void DAESaver::generateEffects(daeElement *effects)
// Effects (face color, alpha)
bool export_textures = gSavedSettings.getBOOL("DAEExportTextures");
for (S32 mat = 0; mat < mAllMaterials.size(); mat++)
for (U32 mat = 0; mat < mAllMaterials.size(); mat++)
{
LLColor4 color = mAllMaterials[mat].color;
domEffect* effect = (domEffect*)effects->add("effect");
@@ -1021,7 +1020,7 @@ void DAESaver::generateEffects(daeElement *effects)
if (export_textures)
{
LLUUID textID;
S32 i = 0;
U32 i = 0;
for (; i < mTextures.size(); i++)
{
if (mAllMaterials[mat].textureID == mTextures[i])
@@ -1068,7 +1067,7 @@ void DAESaver::generateEffects(daeElement *effects)
void DAESaver::generateImagesSection(daeElement* images)
{
for (S32 i=0; i < mTextureNames.size(); i++)
for (U32 i=0; i < mTextureNames.size(); i++)
{
std::string name = mTextureNames[i];
if (name.empty()) continue;