From e9caa218306896b0c14c57bbf1993e17111e00bb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 17 Aug 2012 14:43:20 +0000 Subject: fix own error in recent smoothview cleanup, also correct some cross references in bmesh docs. --- source/blender/blenkernel/intern/DerivedMesh.c | 4 ++-- source/blender/blenkernel/intern/armature.c | 2 +- source/blender/blenkernel/intern/boids.c | 2 +- source/blender/blenkernel/intern/cdderivedmesh.c | 12 ++++++------ source/blender/blenkernel/intern/customdata.c | 4 ++-- source/blender/blenkernel/intern/dynamicpaint.c | 2 +- source/blender/blenkernel/intern/editderivedmesh.c | 6 +++--- source/blender/blenkernel/intern/font.c | 2 +- source/blender/blenkernel/intern/gpencil.c | 2 +- source/blender/blenkernel/intern/idprop.c | 10 +++++----- source/blender/blenkernel/intern/mesh.c | 12 ++++++------ 11 files changed, 29 insertions(+), 29 deletions(-) (limited to 'source/blender/blenkernel/intern') diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index 120a0b2ba27..a8a3d0cdbcb 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -498,7 +498,7 @@ void DM_to_mesh(DerivedMesh *dm, Mesh *me, Object *ob) } } else { - /*if no object, set to INT_MAX so we don't mess up any shapekey layers*/ + /* if no object, set to INT_MAX so we don't mess up any shapekey layers */ uid = INT_MAX; } @@ -1188,7 +1188,7 @@ void DM_update_weight_mcol(Object *ob, DerivedMesh *dm, int const draw_flag, wtcol_v = calc_weightpaint_vert_array(ob, dm, draw_flag, coba); /* Now copy colors in all face verts. */ - /*first add colors to the tessellation faces*/ + /* first add colors to the tessellation faces */ /* XXX Why update that layer? We have to update WEIGHT_MLOOPCOL anyway, * and tessellation recreates mface layers from mloop/mpoly ones, so no * need to fill WEIGHT_MCOL here. */ diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index c10b1e2d4f4..79ee0e96450 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -210,7 +210,7 @@ bArmature *BKE_armature_copy(bArmature *arm) newArm = BKE_libblock_copy(&arm->id); BLI_duplicatelist(&newArm->bonebase, &arm->bonebase); - /* Duplicate the childrens' lists*/ + /* Duplicate the childrens' lists */ newBone = newArm->bonebase.first; for (oldBone = arm->bonebase.first; oldBone; oldBone = oldBone->next) { newBone->parent = NULL; diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c index e6259cc9faf..79d5e092a10 100644 --- a/source/blender/blenkernel/intern/boids.c +++ b/source/blender/blenkernel/intern/boids.c @@ -425,7 +425,7 @@ static int rule_follow_leader(BoidRule *rule, BoidBrainData *bbd, BoidValues *va if (flbr->ob) { float vec2[3], t; - /* first check we're not blocking the leader*/ + /* first check we're not blocking the leader */ sub_v3_v3v3(vec, flbr->loc, flbr->oloc); mul_v3_fl(vec, 1.0f/bbd->timestep); diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 88748d5f0b8..881caec8a58 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -1869,7 +1869,7 @@ DerivedMesh *CDDM_from_BMEditMesh(BMEditMesh *em, Mesh *UNUSED(me), int use_mdis dm->deformedOnly = 1; - /*don't add origindex layer if one already exists*/ + /* don't add origindex layer if one already exists */ add_orig = !CustomData_has_layer(&bm->pdata, CD_ORIGINDEX); mask = use_mdisps ? CD_MASK_DERIVEDMESH | CD_MASK_MDISPS : CD_MASK_DERIVEDMESH; @@ -1886,7 +1886,7 @@ DerivedMesh *CDDM_from_BMEditMesh(BMEditMesh *em, Mesh *UNUSED(me), int use_mdis CustomData_merge(&bm->pdata, &dm->polyData, mask, CD_CALLOC, dm->numPolyData); - /*add tessellation mface layers*/ + /* add tessellation mface layers */ if (use_tessface) { CustomData_from_bmeshpoly(&dm->faceData, &dm->polyData, &dm->loopData, em->tottri); } @@ -2260,7 +2260,7 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap) newe = MEM_callocN(sizeof(int) * dm->numEdgeData, "newv etable CDDM_merge_verts"); newl = MEM_callocN(sizeof(int) * totloop, "newv ltable CDDM_merge_verts"); - /*fill newl with destination vertex indices*/ + /* fill newl with destination vertex indices */ mv = cddm->mvert; c = 0; for (i = 0; i < dm->numVertData; i++, mv++) { @@ -2271,14 +2271,14 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap) } } - /*now link target vertices to destination indices*/ + /* now link target vertices to destination indices */ for (i = 0; i < dm->numVertData; i++) { if (vtargetmap[i] != -1) { newv[i] = newv[vtargetmap[i]]; } } - /*find-replace merged vertices with target vertices*/ + /* find-replace merged vertices with target vertices */ ml = cddm->mloop; for (i = 0; i < totloop; i++, ml++) { if (vtargetmap[ml->v] != -1) { @@ -2286,7 +2286,7 @@ DerivedMesh *CDDM_merge_verts(DerivedMesh *dm, const int *vtargetmap) } } - /*now go through and fix edges and faces*/ + /* now go through and fix edges and faces */ med = cddm->medge; c = 0; for (i = 0; i < dm->numEdgeData; i++, med++) { diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index d92c4ca8632..4963fe8899b 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -2139,8 +2139,8 @@ void CustomData_set(const CustomData *data, int index, int type, void *source) memcpy(dest, source, typeInfo->size); } -/*Bmesh functions*/ -/*needed to convert to/from different face reps*/ +/* BMesh functions */ +/* needed to convert to/from different face reps */ void CustomData_to_bmeshpoly(CustomData *fdata, CustomData *pdata, CustomData *ldata, int totloop, int totpoly) { diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c index 0daf06c6305..8db93f8b44a 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.c +++ b/source/blender/blenkernel/intern/dynamicpaint.c @@ -4318,7 +4318,7 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force dir_factor = dir_dot * MIN2(speed_scale, 1.0f) * w_factor; if (dir_factor > 0.5f) dir_factor = 0.5f; - /* mix new wetness*/ + /* mix new wetness */ ePoint->wetness += dir_factor; CLAMP(ePoint->wetness, 0.0f, MAX_WETNESS); diff --git a/source/blender/blenkernel/intern/editderivedmesh.c b/source/blender/blenkernel/intern/editderivedmesh.c index 32c6caffff7..c6ba6a0d841 100644 --- a/source/blender/blenkernel/intern/editderivedmesh.c +++ b/source/blender/blenkernel/intern/editderivedmesh.c @@ -151,7 +151,7 @@ static void BMEdit_RecalcTessellation_intern(BMEditMesh *tm) #endif BM_ITER_MESH (efa, &iter, bm, BM_FACES_OF_MESH) { - /*don't consider two-edged faces*/ + /* don't consider two-edged faces */ if (efa->len < 3) { /* do nothing */ } @@ -198,7 +198,7 @@ static void BMEdit_RecalcTessellation_intern(BMEditMesh *tm) /* scanfill time */ BM_ITER_ELEM_INDEX (l, &liter, efa, BM_LOOPS_OF_FACE, j) { - /*mark order*/ + /*mark order */ BM_elem_index_set(l, j); /* set_loop */ sf_vert = BLI_scanfill_vert_add(&sf_ctx, l->v->co); @@ -334,7 +334,7 @@ typedef struct EditDerivedBMesh { float (*polyNos)[3]; /* private variables, for number of verts/edges/faces - * within the above hash/table members*/ + * within the above hash/table members */ int tv, te, tf; } EditDerivedBMesh; diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 02e5dc02746..49c3d77a527 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -422,7 +422,7 @@ static void buildchar(Main *bmain, Curve *cu, unsigned long character, CharInfo } #endif - /* make a copy at distance ofsx, ofsy with shear*/ + /* make a copy at distance ofsx, ofsy with shear */ fsize = cu->fsize; shear = cu->shear; si = sinf(rot); diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index c317dc63ef7..2ec5801746c 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -97,7 +97,7 @@ void free_gpencil_layers(ListBase *list) /* error checking */ if (list == NULL) return; - /* delete layers*/ + /* delete layers */ for (gpl = list->first; gpl; gpl = gpln) { gpln = gpl->next; diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index a65d03e64cf..7456f9aab8b 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -159,12 +159,12 @@ void IDP_ResizeIDPArray(IDProperty *prop, int newlen) newarr = MEM_callocN(sizeof(IDProperty) * newsize, "idproperty array resized"); if (newlen >= prop->len) { - /* newlen is bigger*/ + /* newlen is bigger */ memcpy(newarr, prop->data.pointer, prop->len * sizeof(IDProperty)); } else { int i; - /* newlen is smaller*/ + /* newlen is smaller */ for (i = newlen; i < prop->len; i++) { IDP_FreeProperty(GETPROP(prop, i)); } @@ -233,12 +233,12 @@ void IDP_ResizeArray(IDProperty *prop, int newlen) newarr = MEM_callocN(idp_size_table[(int)prop->subtype] * newsize, "idproperty array resized"); if (newlen >= prop->len) { - /* newlen is bigger*/ + /* newlen is bigger */ memcpy(newarr, prop->data.pointer, prop->len * idp_size_table[(int)prop->subtype]); idp_resize_group_array(prop, newlen, newarr); } else { - /* newlen is smaller*/ + /* newlen is smaller */ idp_resize_group_array(prop, newlen, newarr); memcpy(newarr, prop->data.pointer, newlen * idp_size_table[(int)prop->subtype]); } @@ -694,7 +694,7 @@ IDProperty *IDP_New(const int type, const IDPropertyTemplate *val, const char *n break; case IDP_ARRAY: { - /*for now, we only support float and int and double arrays*/ + /* for now, we only support float and int and double arrays */ if ( (val->array.type == IDP_FLOAT) || (val->array.type == IDP_INT) || (val->array.type == IDP_DOUBLE) || diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 77cd127e6ea..22945f68c53 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -167,7 +167,7 @@ static int customdata_compare(CustomData *c1, CustomData *c2, Mesh *m1, Mesh *m2 for (j = 0; j < vtot; j++, v1++, v2++) { if (len_v3v3(v1->co, v2->co) > thresh) return MESHCMP_VERTCOMISMATCH; - /*I don't care about normals, let's just do coodinates*/ + /* I don't care about normals, let's just do coodinates */ } } @@ -990,7 +990,7 @@ static void make_edges_mdata(MVert *UNUSED(allvert), MFace *allface, MLoop *alll MEM_freeN(edsort); - /*set edge members of mloops*/ + /* set edge members of mloops */ medge = *alledge; for (a = 0; a < *_totedge; a++, medge++) { BLI_edgehash_insert(hash, medge->v1, medge->v2, SET_INT_IN_POINTER(a)); @@ -2820,7 +2820,7 @@ int BKE_mesh_mpoly_to_mface(struct CustomData *fdata, struct CustomData *ldata, mf = &mface[k]; if (mf->edcode == 3) { - /*sort loop indices to ensure winding is correct*/ + /* sort loop indices to ensure winding is correct */ /* NO SORT - looks like we can skip this */ lindex[0] = mf->v1; @@ -2828,7 +2828,7 @@ int BKE_mesh_mpoly_to_mface(struct CustomData *fdata, struct CustomData *ldata, lindex[2] = mf->v3; lindex[3] = 0; /* unused */ - /*transform loop indices to vert indices*/ + /* transform loop indices to vert indices */ mf->v1 = mloop[mf->v1].v; mf->v2 = mloop[mf->v2].v; mf->v3 = mloop[mf->v3].v; @@ -2839,7 +2839,7 @@ int BKE_mesh_mpoly_to_mface(struct CustomData *fdata, struct CustomData *ldata, test_index_face(mf, fdata, k, 3); } else { - /*sort loop indices to ensure winding is correct*/ + /* sort loop indices to ensure winding is correct */ /* NO SORT - looks like we can skip this */ lindex[0] = mf->v1; @@ -2847,7 +2847,7 @@ int BKE_mesh_mpoly_to_mface(struct CustomData *fdata, struct CustomData *ldata, lindex[2] = mf->v3; lindex[3] = mf->v4; - /*transform loop indices to vert indices*/ + /* transform loop indices to vert indices */ mf->v1 = mloop[mf->v1].v; mf->v2 = mloop[mf->v2].v; mf->v3 = mloop[mf->v3].v; -- cgit v1.2.3