[Bf-blender-cvs] [a2c107a] master: Code cleanup: use 'const' for arrays (blenkernel)
Campbell Barton
noreply at git.blender.org
Sat Apr 26 16:29:37 CEST 2014
Commit: a2c107aef1c8aaf7deb17dd0319bc07e55cb4293
Author: Campbell Barton
Date: Sun Apr 27 00:20:13 2014 +1000
https://developer.blender.org/rBa2c107aef1c8aaf7deb17dd0319bc07e55cb4293
Code cleanup: use 'const' for arrays (blenkernel)
===================================================================
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/action.c
M source/blender/blenkernel/intern/anim_sys.c
M source/blender/blenkernel/intern/bvhutils.c
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/colortools.c
M source/blender/blenkernel/intern/constraint.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenkernel/intern/displist.c
M source/blender/blenkernel/intern/dynamicpaint.c
M source/blender/blenkernel/intern/editderivedmesh.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/key.c
M source/blender/blenkernel/intern/lattice.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/mask.c
M source/blender/blenkernel/intern/mask_evaluate.c
M source/blender/blenkernel/intern/mask_rasterize.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/blenkernel/intern/mesh_mapping.c
M source/blender/blenkernel/intern/mesh_validate.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/object_dupli.c
M source/blender/blenkernel/intern/seqmodifier.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/blenkernel/intern/sound.c
M source/blender/blenkernel/intern/text.c
M source/blender/blenkernel/intern/unit.c
===================================================================
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c
index 68d108f..1f5ad4f 100644
--- a/source/blender/blenkernel/intern/DerivedMesh.c
+++ b/source/blender/blenkernel/intern/DerivedMesh.c
@@ -2791,9 +2791,9 @@ void DM_calc_auto_bump_scale(DerivedMesh *dm)
int t;
for (t = 0; t < nr_tris_to_pile; t++) {
float f2x_area_uv;
- float *p0 = verts[indices[t * 3 + 0]];
- float *p1 = verts[indices[t * 3 + 1]];
- float *p2 = verts[indices[t * 3 + 2]];
+ const float *p0 = verts[indices[t * 3 + 0]];
+ const float *p1 = verts[indices[t * 3 + 1]];
+ const float *p2 = verts[indices[t * 3 + 2]];
float edge_t0[2], edge_t1[2];
sub_v2_v2v2(edge_t0, tex_coords[indices[t * 3 + 1]], tex_coords[indices[t * 3 + 0]]);
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index e0bbe69..d029614 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -1127,7 +1127,7 @@ short action_get_item_transforms(bAction *act, Object *ob, bPoseChannel *pchan,
* - we cannot use the groups, since they may not be grouped in that way...
*/
for (fcu = act->curves.first; fcu; fcu = fcu->next) {
- char *bPtr = NULL, *pPtr = NULL;
+ const char *bPtr = NULL, *pPtr = NULL;
/* if enough flags have been found, we can stop checking unless we're also getting the curves */
if ((flags == ACT_TRANS_ALL) && (curves == NULL))
diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c
index 8542bd6..ae4580b 100644
--- a/source/blender/blenkernel/intern/anim_sys.c
+++ b/source/blender/blenkernel/intern/anim_sys.c
@@ -581,7 +581,7 @@ static char *rna_path_rename_fix(ID *owner_id, const char *prefix, const char *o
/* if we haven't aren't able to resolve the path now, try again after fixing it */
if (!verify_paths || check_rna_path_is_valid(owner_id, oldpath) == 0) {
DynStr *ds = BLI_dynstr_new();
- char *postfixPtr = oldNamePtr + oldNameLen;
+ const char *postfixPtr = oldNamePtr + oldNameLen;
char *newPath = NULL;
char oldChar;
@@ -633,7 +633,7 @@ static void fcurves_path_rename_fix(ID *owner_id, const char *prefix, const char
/* we need to check every curve... */
for (fcu = curves->first; fcu; fcu = fcu->next) {
if (fcu->rna_path) {
- char *old_path = fcu->rna_path;
+ const char *old_path = fcu->rna_path;
/* firstly, handle the F-Curve's own path */
fcu->rna_path = rna_path_rename_fix(owner_id, prefix, oldKey, newKey, fcu->rna_path, verify_paths);
diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c
index 7ba6079..0ceee78 100644
--- a/source/blender/blenkernel/intern/bvhutils.c
+++ b/source/blender/blenkernel/intern/bvhutils.c
@@ -371,7 +371,7 @@ static void mesh_faces_nearest_point(void *userdata, int index, const float co[3
MVert *vert = data->vert;
MFace *face = data->face + index;
- float *t0, *t1, *t2, *t3;
+ const float *t0, *t1, *t2, *t3;
t0 = vert[face->v1].co;
t1 = vert[face->v2].co;
t2 = vert[face->v3].co;
@@ -406,7 +406,7 @@ static void editmesh_faces_nearest_point(void *userdata, int index, const float
BMEditMesh *em = data->em_evil;
const BMLoop **ltri = (const BMLoop **)em->looptris[index];
- float *t0, *t1, *t2;
+ const float *t0, *t1, *t2;
t0 = ltri[0]->v->co;
t1 = ltri[1]->v->co;
t2 = ltri[2]->v->co;
@@ -433,7 +433,7 @@ static void mesh_faces_spherecast(void *userdata, int index, const BVHTreeRay *r
MVert *vert = data->vert;
MFace *face = data->face + index;
- float *t0, *t1, *t2, *t3;
+ const float *t0, *t1, *t2, *t3;
t0 = vert[face->v1].co;
t1 = vert[face->v2].co;
t2 = vert[face->v3].co;
@@ -471,7 +471,7 @@ static void editmesh_faces_spherecast(void *userdata, int index, const BVHTreeRa
BMEditMesh *em = data->em_evil;
const BMLoop **ltri = (const BMLoop **)em->looptris[index];
- float *t0, *t1, *t2;
+ const float *t0, *t1, *t2;
t0 = ltri[0]->v->co;
t1 = ltri[1]->v->co;
t2 = ltri[2]->v->co;
@@ -503,7 +503,7 @@ static void mesh_edges_nearest_point(void *userdata, int index, const float co[3
MEdge *edge = data->edge + index;
float nearest_tmp[3], dist_sq;
- float *t0, *t1;
+ const float *t0, *t1;
t0 = vert[edge->v1].co;
t1 = vert[edge->v2].co;
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 0c38bac..5272332 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -537,7 +537,7 @@ static void cdDM_drawFacesSolid(DerivedMesh *dm,
CDDerivedMesh *cddm = (CDDerivedMesh *) dm;
MVert *mvert = cddm->mvert;
MFace *mface = cddm->mface;
- float *nors = dm->getTessFaceDataArray(dm, CD_NORMAL);
+ const float *nors = dm->getTessFaceDataArray(dm, CD_NORMAL);
short (*lnors)[4][3] = dm->getTessFaceDataArray(dm, CD_TESSLOOPNORMAL);
int a, glmode = -1, shademodel = -1, matnr = -1, drawCurrentMat = 1;
@@ -653,7 +653,7 @@ static void cdDM_drawFacesTex_common(DerivedMesh *dm,
CDDerivedMesh *cddm = (CDDerivedMesh *) dm;
MVert *mv = cddm->mvert;
MFace *mf = DM_get_tessface_data_layer(dm, CD_MFACE);
- float *nors = dm->getTessFaceDataArray(dm, CD_NORMAL);
+ const float *nors = dm->getTessFaceDataArray(dm, CD_NORMAL);
short (*lnors)[4][3] = dm->getTessFaceDataArray(dm, CD_TESSLOOPNORMAL);
MTFace *tf = DM_get_tessface_data_layer(dm, CD_MTFACE);
MCol *mcol;
@@ -887,7 +887,7 @@ static void cdDM_drawMappedFaces(DerivedMesh *dm,
MVert *mv = cddm->mvert;
MFace *mf = cddm->mface;
MCol *mcol;
- float *nors = DM_get_tessface_data_layer(dm, CD_NORMAL);
+ const float *nors = DM_get_tessface_data_layer(dm, CD_NORMAL);
short (*lnors)[4][3] = dm->getTessFaceDataArray(dm, CD_TESSLOOPNORMAL);
int colType, useColors = flag & DM_DRAW_USE_COLORS;
int i, orig;
@@ -1291,7 +1291,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm,
}
else {
GPUBuffer *buffer = NULL;
- char *varray = NULL;
+ const char *varray = NULL;
int numdata = 0, elementsize = 0, offset;
int start = 0, numfaces = 0 /* , prevdraw = 0 */ /* UNUSED */, curface = 0;
int i;
@@ -1429,7 +1429,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm,
}
}
if (attribs.tottang && attribs.tang.array) {
- float *tang = attribs.tang.array[a * 4 + 0];
+ const float *tang = attribs.tang.array[a * 4 + 0];
copy_v4_v4((float *)&varray[elementsize * curface * 3 + offset], tang);
tang = attribs.tang.array[a * 4 + 1];
copy_v4_v4((float *)&varray[elementsize * curface * 3 + offset + elementsize], tang);
@@ -1474,7 +1474,7 @@ static void cdDM_drawMappedFacesGLSL(DerivedMesh *dm,
}
}
if (attribs.tottang && attribs.tang.array) {
- float *tang = attribs.tang.array[a * 4 + 2];
+ const float *tang = attribs.tang.array[a * 4 + 2];
copy_v4_v4((float *)&varray[elementsize * curface * 3 + offset], tang);
tang = attribs.tang.array[a * 4 + 3];
copy_v4_v4((float *)&varray[elementsize * curface * 3 + offset + elementsize], tang);
@@ -1651,7 +1651,7 @@ static void cdDM_foreachMappedVert(
DMForeachFlag flag)
{
MVert *mv = CDDM_get_verts(dm);
- int *index = DM_get_vert_data_layer(dm, CD_ORIGINDEX);
+ const int *index = DM_get_vert_data_layer(dm, CD_ORIGINDEX);
int i;
if (index) {
@@ -2836,7 +2836,7 @@ void CDDM_calc_edges(DerivedMesh *dm)
EdgeHash *eh;
unsigned int eh_reserve;
int v1, v2;
- int *eindex;
+ const int *eindex;
int i, j, *index;
const int numFaces = dm->numPolyData;
const int numLoops = dm->numLoopData;
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index 75d24fa..e90f50d 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -961,7 +961,7 @@ void BKE_histogram_update_sample_line(Histogram *hist, ImBuf *ibuf, const ColorM
const ColorManagedDisplaySettings *display_settings)
{
int i, x, y;
- float *fp;
+ const float *fp;
float rgb[3];
unsigned char *cp;
@@ -1024,7 +1024,7 @@ void scopes_update(Scopes *scopes, ImBuf *ibuf, const ColorManagedViewSettings *
int x, y, c;
unsigned int nl, na, nr, ng, nb;
double divl, diva, divr, divg, divb;
- float *rf = NULL;
+ const float *rf = NULL;
unsigned char *rc = NULL;
unsigned int *bin_lum, *bin_r, *bin_g, *bin_b, *bin_a;
int savedlines, saveline;
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index ccc576e..b55520a 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -460,7 +460,7 @@ static void contarget_get_lattice_mat(Object *ob, const char *substring, float m
Lattice *lt = (Lattice *)ob->data;
DispList *dl = ob->curve_cache ? BKE_displist_find(&ob->curve_cache->disp, DL_VERTS) : NULL;
- float *co = dl ? dl->verts : NULL;
+ const float *co = dl ? dl->verts : NULL;
BPoint *bp = lt->def;
MDeformVert *dv = lt->dvert;
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 96da03d..f0f9a95 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -1598,7 +1598,7 @@ float *BKE_curve_make_orco(Scene *scene, Object *ob, int *r_numVerts)
fp[2] = 0.0;
}
else {
- float *vert;
+ const float *vert;
int realv = v % dl->nr;
int realu = u % dl->parts;
@@ -3673,7 +3673,7 @@ float (*BKE_curve_nurbs_vertexCos_get(ListBase *lb, int *r_numVerts))[3]
void BK_curve_nurbs_vertexCos_apply(ListBase *lb, float (*vertexCos)[3])
{
- float *co = vertexCos[0];
+ const float *co = vertexCos[0];
Nurb *nu;
int i;
@@ -3897,7 +3897,7 @@ bool BKE_nurb_type_convert(Nurb *nu, const short type, const bool use_handles)
bp++;
}
else {
- char *f = &bezt->f1;
+ const char *f = &bezt->f1;
for (c = 0; c < 3; c++, f++) {
copy_v3_v3(bp->v
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list