Rename a variable so we don't have to rely on scoping rules to distinguish

between the same veriable name used twice.

diff --git a/src/Objects/obj.cxx b/src/Objects/obj.cxx
index c9ee8ab3ed30ae820b291a472324eac690f608f9..8fda04db2f587e9627afe9180c6adaa2da5dd674 100644 (file)
--- a/src/Objects/obj.cxx
+++ b/src/Objects/obj.cxx
@@ -275,8 +275,8 @@ static void random_pt_inside_tri( float *res,
 
 static void gen_random_surface_points( ssgLeaf *leaf, ssgVertexArray *lights,
                                        double factor ) {
-    int num = leaf->getNumTriangles();
-    if ( num > 0 ) {
+    int tris = leaf->getNumTriangles();
+    if ( tris > 0 ) {
         short int n1, n2, n3;
         float *p1, *p2, *p3;
         sgVec3 result;
@@ -286,7 +286,7 @@ static void gen_random_surface_points( ssgLeaf *leaf, ssgVertexArray *lights,
         unsigned int seed = (unsigned int)(fabs(p1[0]*100));
         sg_srandom( seed );
 
-        for ( int i = 0; i < num; ++i ) {
+        for ( int i = 0; i < tris; ++i ) {
             leaf->getTriangle( i, &n1, &n2, &n3 );
             p1 = leaf->getVertex(n1);
             p2 = leaf->getVertex(n2);