[Bf-blender-cvs] [b8481f4] master: Minor cleanup - use integers for counters.

Antony Riakiotakis noreply at git.blender.org
Thu Jul 23 23:21:32 CEST 2015


Commit: b8481f468308e9b5c57eb21201828d5ab15cbb68
Author: Antony Riakiotakis
Date:   Thu Jul 23 23:21:19 2015 +0200
Branches: master
https://developer.blender.org/rBb8481f468308e9b5c57eb21201828d5ab15cbb68

Minor cleanup - use integers for counters.

===================================================================

M	source/blender/blenkernel/intern/subsurf_ccg.c

===================================================================

diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c
index a57dc03..566924c 100644
--- a/source/blender/blenkernel/intern/subsurf_ccg.c
+++ b/source/blender/blenkernel/intern/subsurf_ccg.c
@@ -2405,7 +2405,7 @@ static void ccgDM_buffer_copy_edge(
 				}
 			}
 
-			tot_interior += grid_face_side * (2.0 * grid_face_side - 1);
+			tot_interior += grid_face_side * (2 * grid_face_side - 1);
 			index_start += grid_tot_face;
 		}
 	}
@@ -2492,7 +2492,7 @@ static GPUDrawObject *ccgDM_GPUObjectNew(DerivedMesh *dm)
 			matinfo[new_matnr].elements += numVerts * gridFaces * gridFaces * 6;
 			matinfo[new_matnr].loops += numVerts * gridFaces * gridFaces * 4;
 			matinfo[new_matnr].polys++;
-			tot_internal_edges += numVerts * gridFaces * (2.0 * gridFaces - 1);
+			tot_internal_edges += numVerts * gridFaces * (2 * gridFaces - 1);
 		}
 	}
 	else {
@@ -2502,7 +2502,7 @@ static GPUDrawObject *ccgDM_GPUObjectNew(DerivedMesh *dm)
 			matinfo[0].elements += numVerts * gridFaces * gridFaces * 6;
 			matinfo[0].loops += numVerts * gridFaces * gridFaces * 4;
 			matinfo[0].polys++;
-			tot_internal_edges += numVerts * gridFaces * (2.0 * gridFaces - 1);
+			tot_internal_edges += numVerts * gridFaces * (2 * gridFaces - 1);
 		}
 	}




More information about the Bf-blender-cvs mailing list