[Bf-blender-cvs] [2097e62] master: Code cleanup: use r_ prefix for return args
Campbell Barton
noreply at git.blender.org
Sat Mar 15 17:27:00 CET 2014
Commit: 2097e621edcf7658895b9f6ba9cc4e51f5538369
Author: Campbell Barton
Date: Sun Mar 16 03:24:05 2014 +1100
https://developer.blender.org/rB2097e621edcf7658895b9f6ba9cc4e51f5538369
Code cleanup: use r_ prefix for return args
===================================================================
M source/blender/blenfont/intern/blf_translation.c
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/BKE_curve.h
M source/blender/blenkernel/BKE_lattice.h
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/BKE_modifier.h
M source/blender/blenkernel/BKE_subsurf.h
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/displist.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/lattice.c
M source/blender/blenkernel/intern/mask_evaluate.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/blenkernel/intern/modifier.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/blenlib/BLI_edgehash.h
M source/blender/blenlib/BLI_fileops.h
M source/blender/blenlib/BLI_math_color.h
M source/blender/blenlib/BLI_math_geom.h
M source/blender/blenlib/intern/edgehash.c
M source/blender/blenlib/intern/fileops.c
M source/blender/blenlib/intern/math_color.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenlib/intern/string_utf8.c
M source/blender/blenloader/intern/readfile.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/include/ED_object.h
M source/blender/editors/include/ED_uvedit.h
M source/blender/editors/interface/interface_widgets.c
M source/blender/editors/object/object_constraint.c
M source/blender/editors/object/object_hook.c
M source/blender/editors/screen/glutil.c
M source/blender/editors/uvedit/uvedit_ops.c
M source/blender/makesdna/intern/makesdna.c
M source/blender/makesrna/intern/rna_camera_api.c
M source/blender/makesrna/intern/rna_texture_api.c
M source/blender/modifiers/intern/MOD_particleinstance.c
M source/blender/python/bmesh/bmesh_py_types_meshdata.c
M source/blenderplayer/bad_level_call_stubs/stubs.c
M source/gameengine/Converter/BL_ModifierDeformer.cpp
===================================================================
diff --git a/source/blender/blenfont/intern/blf_translation.c b/source/blender/blenfont/intern/blf_translation.c
index dc9baf8..150ff1b 100644
--- a/source/blender/blenfont/intern/blf_translation.c
+++ b/source/blender/blenfont/intern/blf_translation.c
@@ -58,7 +58,7 @@ static unsigned char *unifont_mono_ttf = NULL;
static int unifont_mono_size = 0;
#endif /* WITH_INTERNATIONAL */
-unsigned char *BLF_get_unifont(int *unifont_size_r)
+unsigned char *BLF_get_unifont(int *r_unifont_size)
{
#ifdef WITH_INTERNATIONAL
if (unifont_ttf == NULL) {
@@ -75,11 +75,11 @@ unsigned char *BLF_get_unifont(int *unifont_size_r)
}
}
- *unifont_size_r = unifont_size;
+ *r_unifont_size = unifont_size;
return unifont_ttf;
#else
- (void)unifont_size_r;
+ (void)r_unifont_size;
return NULL;
#endif
}
@@ -93,7 +93,7 @@ void BLF_free_unifont(void)
#endif
}
-unsigned char *BLF_get_unifont_mono(int *unifont_size_r)
+unsigned char *BLF_get_unifont_mono(int *r_unifont_size)
{
#ifdef WITH_INTERNATIONAL
if (unifont_mono_ttf == NULL) {
@@ -110,11 +110,11 @@ unsigned char *BLF_get_unifont_mono(int *unifont_size_r)
}
}
- *unifont_size_r = unifont_mono_size;
+ *r_unifont_size = unifont_mono_size;
return unifont_mono_ttf;
#else
- (void)unifont_size_r;
+ (void)r_unifont_size;
return NULL;
#endif
}
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index 353b1c5..ff1c04f 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);
diff --git a/source/blender/blenkernel/BKE_curve.h b/source/blender/blenkernel/BKE_curve.h
index 4b8c557..1ea2cb0 100644
--- a/source/blender/blenkernel/BKE_curve.h
+++ b/source/blender/blenkernel/BKE_curve.h
@@ -97,7 +97,7 @@ void BKE_curve_nurb_vert_active_set(struct Curve *cu, struct Nurb *nu,
bool BKE_curve_nurb_vert_active_get(struct Curve *cu, struct Nurb **r_nu, void **r_vert);
void BKE_curve_nurb_vert_active_validate(struct Curve *cu);
-float (*BKE_curve_nurbs_vertexCos_get(struct ListBase *lb, int *numVerts_r))[3];
+float (*BKE_curve_nurbs_vertexCos_get(struct ListBase *lb, int *r_numVerts))[3];
void BK_curve_nurbs_vertexCos_apply(struct ListBase *lb, float (*vertexCos)[3]);
float (*BKE_curve_nurbs_keyVertexCos_get(struct ListBase *lb, float *key))[3];
diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h
index fc84ef1..8d8d370 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -73,7 +73,7 @@ void armature_deform_verts(struct Object *armOb, struct Object *target,
float (*defMats)[3][3], int numVerts, int deformflag,
float (*prevCos)[3], const char *defgrp_name);
-float (*BKE_lattice_vertexcos_get(struct Object *ob, int *numVerts_r))[3];
+float (*BKE_lattice_vertexcos_get(struct Object *ob, int *r_numVerts))[3];
void BKE_lattice_vertexcos_apply(struct Object *ob, float (*vertexCos)[3]);
void BKE_lattice_modifiers_calc(struct Scene *scene, struct Object *ob);
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h
index 7b1f39a..25fd951 100644
--- a/source/blender/blenkernel/BKE_mesh.h
+++ b/source/blender/blenkernel/BKE_mesh.h
@@ -79,7 +79,7 @@ int poly_find_loop_from_vert(const struct MPoly *poly,
const struct MLoop *loopstart,
unsigned vert);
-int poly_get_adj_loops_from_vert(unsigned adj_r[3], const struct MPoly *poly,
+int poly_get_adj_loops_from_vert(unsigned r_adj[3], const struct MPoly *poly,
const struct MLoop *mloop, unsigned vert);
int BKE_mesh_edge_other_vert(const struct MEdge *e, int v);
@@ -152,23 +152,23 @@ void BKE_mesh_mselect_active_set(struct Mesh *me, int index, int type);
void BKE_mesh_calc_normals_mapping(
struct MVert *mverts, int numVerts,
- struct MLoop *mloop, struct MPoly *mpolys, int numLoops, int numPolys, float (*polyNors_r)[3],
- struct MFace *mfaces, int numFaces, int *origIndexFace, float (*faceNors_r)[3]);
+ struct MLoop *mloop, struct MPoly *mpolys, int numLoops, int numPolys, float (*r_polyNors)[3],
+ struct MFace *mfaces, int numFaces, const int *origIndexFace, float (*r_faceNors)[3]);
void BKE_mesh_calc_normals_mapping_ex(
struct MVert *mverts, int numVerts,
- struct MLoop *mloop, struct MPoly *mpolys, int numLoops, int numPolys, float (*polyNors_r)[3],
- struct MFace *mfaces, int numFaces, int *origIndexFace, float (*faceNors_r)[3],
+ struct MLoop *mloop, struct MPoly *mpolys, int numLoops, int numPolys, float (*r_polyNors)[3],
+ struct MFace *mfaces, int numFaces, const int *origIndexFace, float (*r_faceNors)[3],
const bool only_face_normals);
void BKE_mesh_calc_normals_poly(
struct MVert *mverts, int numVerts,
struct MLoop *mloop, struct MPoly *mpolys,
- int numLoops, int numPolys, float (*polyNors_r)[3],
+ int numLoops, int numPolys, float (*r_polyNors)[3],
const bool only_face_normals);
void BKE_mesh_calc_normals(struct Mesh *me);
void BKE_mesh_calc_normals_tessface(
struct MVert *mverts, int numVerts,
struct MFace *mfaces, int numFaces,
- float (*faceNors_r)[3]);
+ float (*r_faceNors)[3]);
void BKE_mesh_normals_loop_split(
struct MVert *mverts, const int numVerts, struct MEdge *medges, const int numEdges,
struct MLoop *mloops, float (*r_loopnors)[3], const int numLoops,
@@ -233,8 +233,8 @@ void BKE_mesh_convert_mfaces_to_mpolys_ex(
struct CustomData *fdata, struct CustomData *ldata, struct CustomData *pdata,
int totedge_i, int totface_i, int totloop_i, int totpoly_i,
struct MEdge *medge, struct MFace *mface,
- int *totloop_r, int *totpoly_r,
- struct MLoop **mloop_r, struct MPoly **mpoly_r);
+ int *r_totloop, int *r_totpoly,
+ str
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list