star-3daw

commit 0a82d6fa8fd5c10b1288dca00e5b68e17496c3da
parent 1555bc87cd45a87673868313bd73957539aaa897
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Wed, 18 Nov 2015 14:40:35 +0100

Fix warnings of variables that hide previous local declarations

Diffstat:
M
src/s3daw.c
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/s3daw.c b/src/s3daw.c
@@ -220,7 +220,6 @@ shape_register(struct s3daw* s3daw, const struct aw_obj_named_group* obj_mtl)
     /* Triangulate the face */
     POLYGON(clear(s3daw->polygon));
     FOR_EACH(ivertex, face.vertex_id, face.vertex_id + face.vertices_count) {
-      struct aw_obj_vertex vertex;
       AW(obj_vertex_get(s3daw->loader_obj, ivertex, &vertex));
       res = polygon_vertex_add(s3daw->polygon, vertex.position);
       if(res != RES_OK) goto error;
@@ -375,10 +374,10 @@ shapes_create(struct s3daw* s3daw, const char* filename)
 
     /* Create a S3D shape per material */
     FOR_EACH(imtl, 0, obj_desc.usemtls_count) {
-      const struct aw_material* material;
+      const struct aw_material* pmaterial;
       AW(obj_mtl_get(s3daw->loader_obj, imtl, &s3daw->mtl));
-      material = htable_material_find(&s3daw->materials, &s3daw->mtl.name);
-      if(!material) { /* Some material may not be loaded */
+      pmaterial = htable_material_find(&s3daw->materials, &s3daw->mtl.name);
+      if(!pmaterial) { /* Some material may not be loaded */
         logger_print(s3daw->logger, LOG_WARNING,
           "The material `%s' is not loaded\n", str_cget(&s3daw->mtl.name));
         str_clear(&s3daw->mtl.name);