From 2097e621edcf7658895b9f6ba9cc4e51f5538369 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 16 Mar 2014 03:24:05 +1100 Subject: Code cleanup: use r_ prefix for return args --- source/blender/blenkernel/BKE_DerivedMesh.h | 32 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'source/blender/blenkernel/BKE_DerivedMesh.h') diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h index 353b1c5d597..ff1c04fd00d 100644 --- a/source/blender/blenkernel/BKE_DerivedMesh.h +++ b/source/blender/blenkernel/BKE_DerivedMesh.h @@ -208,9 +208,9 @@ struct DerivedMesh { * of this function can be quite slow, iterating over all * elements (editmesh) */ - void (*getVert)(DerivedMesh *dm, int index, struct MVert *vert_r); - void (*getEdge)(DerivedMesh *dm, int index, struct MEdge *edge_r); - void (*getTessFace)(DerivedMesh *dm, int index, struct MFace *face_r); + void (*getVert)(DerivedMesh *dm, int index, struct MVert *r_vert); + void (*getEdge)(DerivedMesh *dm, int index, struct MEdge *r_edge); + void (*getTessFace)(DerivedMesh *dm, int index, struct MFace *r_face); /** Return a pointer to the entire array of verts/edges/face from the * derived mesh. if such an array does not exist yet, it will be created, @@ -226,11 +226,11 @@ struct DerivedMesh { /** Copy all verts/edges/faces from the derived mesh into * *{vert/edge/face}_r (must point to a buffer large enough) */ - void (*copyVertArray)(DerivedMesh *dm, struct MVert *vert_r); - void (*copyEdgeArray)(DerivedMesh *dm, struct MEdge *edge_r); - void (*copyTessFaceArray)(DerivedMesh *dm, struct MFace *face_r); - void (*copyLoopArray)(DerivedMesh *dm, struct MLoop *loop_r); - void (*copyPolyArray)(DerivedMesh *dm, struct MPoly *poly_r); + void (*copyVertArray)(DerivedMesh *dm, struct MVert *r_vert); + void (*copyEdgeArray)(DerivedMesh *dm, struct MEdge *r_edge); + void (*copyTessFaceArray)(DerivedMesh *dm, struct MFace *r_face); + void (*copyLoopArray)(DerivedMesh *dm, struct MLoop *r_loop); + void (*copyPolyArray)(DerivedMesh *dm, struct MPoly *r_poly); /** Return a copy of all verts/edges/faces from the derived mesh * it is the caller's responsibility to free the returned pointer @@ -318,21 +318,21 @@ struct DerivedMesh { * * Also called in Editmode */ - void (*getMinMax)(DerivedMesh *dm, float min_r[3], float max_r[3]); + void (*getMinMax)(DerivedMesh *dm, float r_min[3], float r_max[3]); /** Direct Access Operations * - Can be undefined * - Must be defined for modifiers that only deform however */ /** Get vertex location, undefined if index is not valid */ - void (*getVertCo)(DerivedMesh *dm, int index, float co_r[3]); + void (*getVertCo)(DerivedMesh *dm, int index, float r_co[3]); /** Fill the array (of length .getNumVerts()) with all vertex locations */ - void (*getVertCos)(DerivedMesh *dm, float (*cos_r)[3]); + void (*getVertCos)(DerivedMesh *dm, float (*r_cos)[3]); /** Get smooth vertex normal, undefined if index is not valid */ - void (*getVertNo)(DerivedMesh *dm, int index, float no_r[3]); - void (*getPolyNo)(DerivedMesh *dm, int index, float no_r[3]); + void (*getVertNo)(DerivedMesh *dm, int index, float r_no[3]); + void (*getPolyNo)(DerivedMesh *dm, int index, float r_no[3]); /** Get a map of vertices to faces */ @@ -385,7 +385,7 @@ struct DerivedMesh { /** Draw mapped faces (no color, or texture) * - Only if !setDrawOptions or - * setDrawOptions(userData, mapped-face-index, drawSmooth_r) + * setDrawOptions(userData, mapped-face-index, r_drawSmooth) * returns true * * If drawSmooth is set to true then vertex normals should be set and @@ -670,9 +670,9 @@ DerivedMesh *editbmesh_get_derived_base(struct Object *, struct BMEditMesh *em); DerivedMesh *editbmesh_get_derived_cage(struct Scene *scene, struct Object *, struct BMEditMesh *em, CustomDataMask dataMask); DerivedMesh *editbmesh_get_derived_cage_and_final(struct Scene *scene, struct Object *, - struct BMEditMesh *em, DerivedMesh **final_r, + struct BMEditMesh *em, DerivedMesh **r_final, CustomDataMask dataMask); -float (*editbmesh_get_vertex_cos(struct BMEditMesh *em, int *numVerts_r))[3]; +float (*editbmesh_get_vertex_cos(struct BMEditMesh *em, int *r_numVerts))[3]; bool editbmesh_modifier_is_enabled(struct Scene *scene, struct ModifierData *md, DerivedMesh *dm); void makeDerivedMesh(struct Scene *scene, struct Object *ob, struct BMEditMesh *em, CustomDataMask dataMask, int build_shapekey_layers); -- cgit v1.2.3