[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49955] trunk/blender/source/blender: fix own error in recent smoothview cleanup, also correct some cross references in bmesh docs.
Campbell Barton
ideasman42 at gmail.com
Fri Aug 17 16:43:21 CEST 2012
Revision: 49955
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49955
Author: campbellbarton
Date: 2012-08-17 14:43:20 +0000 (Fri, 17 Aug 2012)
Log Message:
-----------
fix own error in recent smoothview cleanup, also correct some cross references in bmesh docs.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/boids.c
trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/customdata.c
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
trunk/blender/source/blender/blenkernel/intern/font.c
trunk/blender/source/blender/blenkernel/intern/gpencil.c
trunk/blender/source/blender/blenkernel/intern/idprop.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/bmesh/intern/bmesh_core.c
trunk/blender/source/blender/bmesh/intern/bmesh_marking.c
trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
trunk/blender/source/blender/bmesh/intern/bmesh_polygon.c
trunk/blender/source/blender/bmesh/intern/bmesh_queries.c
trunk/blender/source/blender/editors/animation/fmodifier_ui.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/render/intern/source/shadbuf.c
Modified: trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-08-17 13:59:08 UTC (rev 49954)
+++ trunk/blender/source/blender/blenkernel/intern/DerivedMesh.c 2012-08-17 14:43:20 UTC (rev 49955)
@@ -498,7 +498,7 @@
}
}
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 @@
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. */
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2012-08-17 13:59:08 UTC (rev 49954)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2012-08-17 14:43:20 UTC (rev 49955)
@@ -210,7 +210,7 @@
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;
Modified: trunk/blender/source/blender/blenkernel/intern/boids.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/boids.c 2012-08-17 13:59:08 UTC (rev 49954)
+++ trunk/blender/source/blender/blenkernel/intern/boids.c 2012-08-17 14:43:20 UTC (rev 49955)
@@ -425,7 +425,7 @@
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);
Modified: trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-08-17 13:59:08 UTC (rev 49954)
+++ trunk/blender/source/blender/blenkernel/intern/cdderivedmesh.c 2012-08-17 14:43:20 UTC (rev 49955)
@@ -1869,7 +1869,7 @@
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 @@
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 @@
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 @@
}
}
- /*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 @@
}
}
- /*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++) {
Modified: trunk/blender/source/blender/blenkernel/intern/customdata.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-08-17 13:59:08 UTC (rev 49954)
+++ trunk/blender/source/blender/blenkernel/intern/customdata.c 2012-08-17 14:43:20 UTC (rev 49955)
@@ -2139,8 +2139,8 @@
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)
{
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2012-08-17 13:59:08 UTC (rev 49954)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c 2012-08-17 14:43:20 UTC (rev 49955)
@@ -4318,7 +4318,7 @@
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);
Modified: trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-08-17 13:59:08 UTC (rev 49954)
+++ trunk/blender/source/blender/blenkernel/intern/editderivedmesh.c 2012-08-17 14:43:20 UTC (rev 49955)
@@ -151,7 +151,7 @@
#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 @@
/* 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 @@
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;
Modified: trunk/blender/source/blender/blenkernel/intern/font.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/font.c 2012-08-17 13:59:08 UTC (rev 49954)
+++ trunk/blender/source/blender/blenkernel/intern/font.c 2012-08-17 14:43:20 UTC (rev 49955)
@@ -422,7 +422,7 @@
}
#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);
Modified: trunk/blender/source/blender/blenkernel/intern/gpencil.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/gpencil.c 2012-08-17 13:59:08 UTC (rev 49954)
+++ trunk/blender/source/blender/blenkernel/intern/gpencil.c 2012-08-17 14:43:20 UTC (rev 49955)
@@ -97,7 +97,7 @@
/* error checking */
if (list == NULL) return;
- /* delete layers*/
+ /* delete layers */
for (gpl = list->first; gpl; gpl = gpln) {
gpln = gpl->next;
Modified: trunk/blender/source/blender/blenkernel/intern/idprop.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/idprop.c 2012-08-17 13:59:08 UTC (rev 49954)
+++ trunk/blender/source/blender/blenkernel/intern/idprop.c 2012-08-17 14:43:20 UTC (rev 49955)
@@ -159,12 +159,12 @@
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 @@
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 @@
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) ||
Modified: trunk/blender/source/blender/blenkernel/intern/mesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-08-17 13:59:08 UTC (rev 49954)
+++ trunk/blender/source/blender/blenkernel/intern/mesh.c 2012-08-17 14:43:20 UTC (rev 49955)
@@ -167,7 +167,7 @@
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 @@
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 @@
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 @@
lindex[2] = mf->v3;
lindex[3] = 0; /* unused */
- /*transform loop indices to vert indices*/
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list