[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13534] trunk/blender: Clean-up for various gcc warnings under linux.
Ken Hughes
khughes at pacific.edu
Sun Feb 3 02:33:37 CET 2008
Revision: 13534
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13534
Author: khughes
Date: 2008-02-03 02:33:35 +0100 (Sun, 03 Feb 2008)
Log Message:
-----------
Clean-up for various gcc warnings under linux.
Modified Paths:
--------------
trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/imbuf/intern/filter.c
trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
trunk/blender/source/blender/src/buttons_object.c
trunk/blender/source/blender/src/editobject.c
Modified: trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp 2008-02-03 01:30:15 UTC (rev 13533)
+++ trunk/blender/extern/bullet2/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp 2008-02-03 01:33:35 UTC (rev 13534)
@@ -85,7 +85,6 @@
btSimpleBroadphaseProxy* proxy1 = &m_proxies[0];
- int index = int(proxy - proxy1);
btAssert(index == freeIndex);
m_pProxies[m_numProxies] = proxy;
Modified: trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp 2008-02-03 01:30:15 UTC (rev 13533)
+++ trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexTriangleMeshShape.cpp 2008-02-03 01:33:35 UTC (rev 13534)
@@ -202,4 +202,4 @@
const btVector3& btConvexTriangleMeshShape::getLocalScaling() const
{
return m_stridingMesh->getScaling();
-}
\ No newline at end of file
+}
Modified: trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp 2008-02-03 01:30:15 UTC (rev 13533)
+++ trunk/blender/extern/bullet2/src/BulletCollision/CollisionShapes/btOptimizedBvh.cpp 2008-02-03 01:33:35 UTC (rev 13534)
@@ -528,7 +528,6 @@
splitIndex = startIndex+ (numIndices>>1);
}
- bool unbal = (splitIndex==startIndex) || (splitIndex == (endIndex));
btAssert(!unbal);
return splitIndex;
@@ -702,7 +701,6 @@
int curIndex = startNodeIndex;
int walkIterations = 0;
- int subTreeSize = endNodeIndex - startNodeIndex;
const btQuantizedBvhNode* rootNode = &m_quantizedContiguousNodes[startNodeIndex];
int escapeIndex;
Modified: trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp 2008-02-03 01:30:15 UTC (rev 13533)
+++ trunk/blender/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.cpp 2008-02-03 01:33:35 UTC (rev 13534)
@@ -205,7 +205,6 @@
btVector3 pivotBInW = m_rbB.getCenterOfMassTransform()*m_rbBFrame.getOrigin();
btScalar tau = btScalar(0.3);
- btScalar damping = btScalar(1.);
//linear part
if (!m_angularOnly)
Modified: trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp
===================================================================
--- trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp 2008-02-03 01:30:15 UTC (rev 13533)
+++ trunk/blender/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.cpp 2008-02-03 01:33:35 UTC (rev 13534)
@@ -342,4 +342,4 @@
{
m_constraintRefs.remove(c);
m_checkCollideWith = m_constraintRefs.size() > 0;
-}
\ No newline at end of file
+}
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2008-02-03 01:30:15 UTC (rev 13533)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2008-02-03 01:33:35 UTC (rev 13534)
@@ -846,8 +846,8 @@
}
else if (md->type==eModifierType_Collision) {
+ /*
CollisionModifierData *collmd = (CollisionModifierData*) md;
- /*
// TODO: CollisionModifier should use pointcache
// + have proper reset events before enabling this
writestruct(wd, DATA, "MVert", collmd->numverts, collmd->x);
Modified: trunk/blender/source/blender/imbuf/intern/filter.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/filter.c 2008-02-03 01:30:15 UTC (rev 13533)
+++ trunk/blender/source/blender/imbuf/intern/filter.c 2008-02-03 01:33:35 UTC (rev 13534)
@@ -256,7 +256,6 @@
float *temprect;
float *row1f, *row2f, *row3f;
float *fp;
- int pixlen = 4;
temprect= MEM_dupallocN(ibuf->rect_float);
for(y=1; y<=ibuf->y; y++) {
Modified: trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2008-02-03 01:30:15 UTC (rev 13533)
+++ trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp 2008-02-03 01:33:35 UTC (rev 13534)
@@ -620,7 +620,6 @@
void IMB_exr_close(void *handle)
{
ExrHandle *data= (ExrHandle *)handle;
- ExrChannel *echan;
ExrLayer *lay;
ExrPass *pass;
@@ -783,28 +782,28 @@
/* we can have RGB(A), XYZ(W), UVA */
if(pass->totchan==3 || pass->totchan==4) {
if(pass->chan[0]->chan_id=='B' || pass->chan[1]->chan_id=='B' || pass->chan[2]->chan_id=='B') {
- lookup['R']= 0;
- lookup['G']= 1;
- lookup['B']= 2;
- lookup['A']= 3;
+ lookup[(unsigned int)'R']= 0;
+ lookup[(unsigned int)'G']= 1;
+ lookup[(unsigned int)'B']= 2;
+ lookup[(unsigned int)'A']= 3;
}
else if(pass->chan[0]->chan_id=='Y' || pass->chan[1]->chan_id=='Y' || pass->chan[2]->chan_id=='Y') {
- lookup['X']= 0;
- lookup['Y']= 1;
- lookup['Z']= 2;
- lookup['W']= 3;
+ lookup[(unsigned int)'X']= 0;
+ lookup[(unsigned int)'Y']= 1;
+ lookup[(unsigned int)'Z']= 2;
+ lookup[(unsigned int)'W']= 3;
}
else {
- lookup['U']= 0;
- lookup['V']= 1;
- lookup['A']= 2;
+ lookup[(unsigned int)'U']= 0;
+ lookup[(unsigned int)'V']= 1;
+ lookup[(unsigned int)'A']= 2;
}
for(a=0; a<pass->totchan; a++) {
echan= pass->chan[a];
- echan->rect= pass->rect + lookup[echan->chan_id];
+ echan->rect= pass->rect + lookup[(unsigned int)echan->chan_id];
echan->xstride= pass->totchan;
echan->ystride= width*pass->totchan;
- pass->chan_id[ lookup[echan->chan_id] ]= echan->chan_id;
+ pass->chan_id[ (unsigned int)lookup[(unsigned int)echan->chan_id] ]= echan->chan_id;
}
}
else { /* unknown */
@@ -836,6 +835,7 @@
} RGBA;
+#if 0
static void exr_print_filecontents(InputFile *file)
{
const ChannelList &channels = file->header().channels();
@@ -846,6 +846,7 @@
printf("OpenEXR-load: Found channel %s of type %d\n", i.name(), channel.type);
}
}
+#endif
static int exr_has_zbuffer(InputFile *file)
{
@@ -853,7 +854,6 @@
for (ChannelList::ConstIterator i = channels.begin(); i != channels.end(); ++i)
{
- const Channel &channel = i.channel();
if(strcmp("Z", i.name())==0)
return 1;
}
Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c 2008-02-03 01:30:15 UTC (rev 13533)
+++ trunk/blender/source/blender/src/buttons_object.c 2008-02-03 01:33:35 UTC (rev 13534)
@@ -2222,7 +2222,7 @@
case B_DUPLI_VERTS:
ob->transflag &= ~(OB_DUPLIFRAMES|OB_DUPLIFACES|OB_DUPLIGROUP);
DAG_scene_sort(G.scene);
- DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
+ DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA|OB_RECALC_OB);
allqueue(REDRAWVIEW3D, 0);
allqueue(REDRAWBUTSOBJECT, 0);
break;
@@ -3572,7 +3572,7 @@
SoftBody *sb=ob->soft;
uiBlock *block;
static int val;
- short *softflag=&ob->softflag, psys_cur=0, adaptive_mode=0;
+ short *softflag=&ob->softflag, psys_cur=0;
int ob_has_hair=psys_ob_has_hair(ob);
if(!_can_softbodies_at_all(ob)) return;
/*bah that is ugly! creating missing data members in UI code*/
Modified: trunk/blender/source/blender/src/editobject.c
===================================================================
--- trunk/blender/source/blender/src/editobject.c 2008-02-03 01:30:15 UTC (rev 13533)
+++ trunk/blender/source/blender/src/editobject.c 2008-02-03 01:33:35 UTC (rev 13534)
@@ -5601,9 +5601,6 @@
void mirrormenu(void)
{
- short mode = 0;
-
-
if(G.f & G_PARTICLEEDIT) {
PE_mirror_x(0);
}
More information about the Bf-blender-cvs
mailing list