[Bf-blender-cvs] [1cc677a] GPU_data_request: const-ify BKE_mesh_calc_poly_normal
Mike Erwin
noreply at git.blender.org
Tue Apr 21 08:29:36 CEST 2015
Commit: 1cc677a037ee6886fda73f1880a7e103012d0b91
Author: Mike Erwin
Date: Tue Apr 21 00:35:52 2015 -0400
Branches: GPU_data_request
https://developer.blender.org/rB1cc677a037ee6886fda73f1880a7e103012d0b91
const-ify BKE_mesh_calc_poly_normal
Some of my new mesh drawing code needs to call this with const data.
TODO: swing the “const hammer” at more BKE_mesh functions
===================================================================
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/intern/mesh_evaluate.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 5cf557a..ae2ad57 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -229,8 +229,8 @@ void BKE_mesh_normals_loop_custom_from_vertices_set(
short (*r_clnors_data)[2]);
void BKE_mesh_calc_poly_normal(
- struct MPoly *mpoly, struct MLoop *loopstart,
- struct MVert *mvarray, float no[3]);
+ const struct MPoly *mpoly, const struct MLoop *loopstart,
+ const struct MVert *mvarray, float no[3]);
void BKE_mesh_calc_poly_normal_coords(
struct MPoly *mpoly, struct MLoop *loopstart,
const float (*vertex_coords)[3], float no[3]);
diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c
index ceb9b01..bbcd339 100644
--- a/source/blender/blenkernel/intern/mesh_evaluate.c
+++ b/source/blender/blenkernel/intern/mesh_evaluate.c
@@ -1621,8 +1621,8 @@ void BKE_mesh_loop_tangents(Mesh *mesh, const char *uvmap, float (*r_looptangent
* computing newell normal.
*
*/
-static void mesh_calc_ngon_normal(MPoly *mpoly, MLoop *loopstart,
- MVert *mvert, float normal[3])
+static void mesh_calc_ngon_normal(const MPoly *mpoly, const MLoop *loopstart,
+ const MVert *mvert, float normal[3])
{
const int nverts = mpoly->totloop;
const float *v_prev = mvert[loopstart[nverts - 1].v].co;
@@ -1643,8 +1643,8 @@ static void mesh_calc_ngon_normal(MPoly *mpoly, MLoop *loopstart,
}
}
-void BKE_mesh_calc_poly_normal(MPoly *mpoly, MLoop *loopstart,
- MVert *mvarray, float no[3])
+void BKE_mesh_calc_poly_normal(const MPoly *mpoly, const MLoop *loopstart,
+ const MVert *mvarray, float no[3])
{
if (mpoly->totloop > 4) {
mesh_calc_ngon_normal(mpoly, loopstart, mvarray, no);
More information about the Bf-blender-cvs
mailing list