star-3d

commit 4ed84b3bfb372c56e465855468f5ac435df77fcb
parent 13b813148a3fdd9958f6b71bdd9fb914eceaa061
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Mon, 30 Apr 2018 16:37:06 +0200

Workaround for a VC2017 bug.

Diffstat:
M
src/s3d_mesh.c
 | 
12
++++++------
M
src/s3d_sphere.c
 | 
8
++++----

2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/s3d_mesh.c b/src/s3d_mesh.c
@@ -218,15 +218,15 @@ mesh_compute_triangle_2area(struct mesh* mesh, const size_t itri)
 static void
 mesh_release(ref_T* ref)
 {
-  struct mesh* mesh;
+  struct mesh* msh;
   struct s3d_device* dev;
   ASSERT(ref);
 
-  mesh = CONTAINER_OF(ref, struct mesh, ref);
-  mesh_clear(mesh);
-  dev = mesh->dev;
-  darray_float_release(&mesh->cdf);
-  MEM_RM(dev->allocator, mesh);
+  msh = CONTAINER_OF(ref, struct mesh, ref);
+  mesh_clear(msh);
+  dev = msh->dev;
+  darray_float_release(&msh->cdf);
+  MEM_RM(dev->allocator, msh);
   S3D(device_ref_put(dev));
 }
 
diff --git a/src/s3d_sphere.c b/src/s3d_sphere.c
@@ -39,13 +39,13 @@
 static void
 sphere_release(ref_T* ref)
 {
-  struct sphere* sphere;
+  struct sphere* sphre;
   struct s3d_device* dev;
   ASSERT(ref);
 
-  sphere = CONTAINER_OF(ref, struct sphere, ref);
-  dev = sphere->dev;
-  MEM_RM(dev->allocator, sphere);
+  sphre = CONTAINER_OF(ref, struct sphere, ref);
+  dev = sphre->dev;
+  MEM_RM(dev->allocator, sphre);
   S3D(device_ref_put(dev));
 }