[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45744] branches/soc-2011-tomato: Merging r45738 through r45743 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Wed Apr 18 14:54:12 CEST 2012
Revision: 45744
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45744
Author: nazgul
Date: 2012-04-18 12:54:12 +0000 (Wed, 18 Apr 2012)
Log Message:
-----------
Merging r45738 through r45743 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45738
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45743
Modified Paths:
--------------
branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-tomato/source/blender/editors/transform/transform.c
Added Paths:
-----------
branches/soc-2011-tomato/source/tools/uncrustify_clean.sh
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-45737
+ /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-45743
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh_validate.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh_validate.c 2012-04-18 09:56:19 UTC (rev 45743)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh_validate.c 2012-04-18 12:54:12 UTC (rev 45744)
@@ -63,7 +63,7 @@
/* TODO check there is not some standard define of this somewhere! */
static int int_cmp(const void *v1, const void *v2)
{
- return *(int*)v1 > *(int*)v2 ? 1 : *(int*)v1 < *(int*)v2 ? -1 : 0;
+ return *(int *)v1 > *(int *)v2 ? 1 : *(int *)v1 < *(int *)v2 ? -1 : 0;
}
static int search_poly_cmp(const void *v1, const void *v2)
@@ -103,11 +103,11 @@
MDeformVert *dverts, /* assume totvert length */
const short do_verbose, const short do_fixes)
{
-# define REMOVE_EDGE_TAG(_me) { _me->v2 = _me->v1; do_edge_free = TRUE; }
-# define IS_REMOVED_EDGE(_me) (_me->v2 == _me->v1)
+# define REMOVE_EDGE_TAG(_me) { _me->v2 = _me->v1; do_edge_free = TRUE; }
+# define IS_REMOVED_EDGE(_me) (_me->v2 == _me->v1)
-# define REMOVE_LOOP_TAG(_ml) { _ml->e = INVALID_LOOP_EDGE_MARKER; do_polyloop_free = TRUE; }
-# define REMOVE_POLY_TAG(_mp) { _mp->totloop *= -1; do_polyloop_free = TRUE; }
+# define REMOVE_LOOP_TAG(_ml) { _ml->e = INVALID_LOOP_EDGE_MARKER; do_polyloop_free = TRUE; }
+# define REMOVE_POLY_TAG(_mp) { _mp->totloop *= -1; do_polyloop_free = TRUE; }
MVert *mv = mverts;
MEdge *me;
@@ -116,13 +116,13 @@
unsigned int i, j;
int *v;
- short do_edge_free= FALSE;
- short do_polyloop_free= FALSE; /* This regroups loops and polys! */
+ short do_edge_free = FALSE;
+ short do_polyloop_free = FALSE; /* This regroups loops and polys! */
- short verts_fixed= FALSE;
- short vert_weights_fixed= FALSE;
+ short verts_fixed = FALSE;
+ short vert_weights_fixed = FALSE;
- int do_edge_recalc= FALSE;
+ int do_edge_recalc = FALSE;
EdgeHash *edge_hash = BLI_edgehash_new();
@@ -136,53 +136,53 @@
do_edge_recalc = do_fixes;
}
- for (i=1; i<totvert; i++, mv++) {
+ for (i = 1; i < totvert; i++, mv++) {
int j;
- int fix_normal= TRUE;
+ int fix_normal = TRUE;
- for (j=0; j<3; j++) {
+ for (j = 0; j < 3; j++) {
if (!finite(mv->co[j])) {
PRINT(" vertex %u: has invalid coordinate\n", i);
if (do_fixes) {
zero_v3(mv->co);
- verts_fixed= TRUE;
+ verts_fixed = TRUE;
}
}
- if (mv->no[j]!=0)
- fix_normal= FALSE;
+ if (mv->no[j] != 0)
+ fix_normal = FALSE;
}
if (fix_normal) {
PRINT(" vertex %u: has zero normal, assuming Z-up normal\n", i);
if (do_fixes) {
- mv->no[2]= SHRT_MAX;
- verts_fixed= TRUE;
+ mv->no[2] = SHRT_MAX;
+ verts_fixed = TRUE;
}
}
}
- for (i=0, me= medges; i<totedge; i++, me++) {
- int remove= FALSE;
+ for (i = 0, me = medges; i < totedge; i++, me++) {
+ int remove = FALSE;
if (me->v1 == me->v2) {
PRINT(" edge %u: has matching verts, both %u\n", i, me->v1);
- remove= do_fixes;
+ remove = do_fixes;
}
if (me->v1 >= totvert) {
PRINT(" edge %u: v1 index out of range, %u\n", i, me->v1);
- remove= do_fixes;
+ remove = do_fixes;
}
if (me->v2 >= totvert) {
PRINT(" edge %u: v2 index out of range, %u\n", i, me->v2);
- remove= do_fixes;
+ remove = do_fixes;
}
if (BLI_edgehash_haskey(edge_hash, me->v1, me->v2)) {
PRINT(" edge %u: is a duplicate of %d\n", i,
GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, me->v1, me->v2)));
- remove= do_fixes;
+ remove = do_fixes;
}
if (remove == FALSE) {
@@ -281,7 +281,7 @@
int prev_e = ml->e;
ml->e = GET_INT_FROM_POINTER(BLI_edgehash_lookup(edge_hash, v1, v2));
PRINT(" poly %u has invalid edge reference (%u), fixed using edge %u\n",
- sp->index, prev_e, ml->e);
+ sp->index, prev_e, ml->e);
}
else {
PRINT(" poly %u has invalid edge reference (%u)\n", sp->index, ml->e);
@@ -471,24 +471,24 @@
/* fix deform verts */
if (dverts) {
MDeformVert *dv;
- for (i=0, dv= dverts; i<totvert; i++, dv++) {
+ for (i = 0, dv = dverts; i < totvert; i++, dv++) {
MDeformWeight *dw;
unsigned int j;
- for (j=0, dw= dv->dw; j < dv->totweight; j++, dw++) {
+ for (j = 0, dw = dv->dw; j < dv->totweight; j++, dw++) {
/* note, greater then max defgroups is accounted for in our code, but not < 0 */
if (!finite(dw->weight)) {
PRINT(" vertex deform %u, group %d has weight: %f\n", i, dw->def_nr, dw->weight);
if (do_fixes) {
- dw->weight= 0.0f;
- vert_weights_fixed= TRUE;
+ dw->weight = 0.0f;
+ vert_weights_fixed = TRUE;
}
}
else if (dw->weight < 0.0f || dw->weight > 1.0f) {
PRINT(" vertex deform %u, group %d has weight: %f\n", i, dw->def_nr, dw->weight);
if (do_fixes) {
CLAMP(dw->weight, 0.0f, 1.0f);
- vert_weights_fixed= TRUE;
+ vert_weights_fixed = TRUE;
}
}
@@ -500,9 +500,9 @@
/* re-allocated, the new values compensate for stepping
* within the for loop and may not be valid */
j--;
- dw= dv->dw + j;
+ dw = dv->dw + j;
- vert_weights_fixed= TRUE;
+ vert_weights_fixed = TRUE;
}
else { /* all freed */
break;
@@ -515,10 +515,10 @@
PRINT("BKE_mesh_validate: finished\n\n");
-# undef REMOVE_EDGE_TAG
-# undef IS_REMOVED_EDGE
-# undef REMOVE_LOOP_TAG
-# undef REMOVE_POLY_TAG
+# undef REMOVE_EDGE_TAG
+# undef IS_REMOVED_EDGE
+# undef REMOVE_LOOP_TAG
+# undef REMOVE_POLY_TAG
if (mesh) {
if (do_polyloop_free) {
@@ -539,20 +539,20 @@
static int mesh_validate_customdata(CustomData *data, short do_verbose, const short do_fixes)
{
- int i= 0, has_fixes= 0;
+ int i = 0, has_fixes = 0;
- while (i<data->totlayer) {
- CustomDataLayer *layer= &data->layers[i];
- CustomDataMask mask= CD_TYPE_AS_MASK(layer->type);
- int ok= 1;
+ while (i < data->totlayer) {
+ CustomDataLayer *layer = &data->layers[i];
+ CustomDataMask mask = CD_TYPE_AS_MASK(layer->type);
+ int ok = 1;
- if ((mask&CD_MASK_MESH)==0) {
+ if ((mask & CD_MASK_MESH) == 0) {
PRINT("CustomDataLayer type %d which isn't in CD_MASK_MESH is stored in Mehs structure\n", layer->type);
if (do_fixes) {
CustomData_free_layer(data, layer->type, 0, i);
- ok= 0;
- has_fixes= 1;
+ ok = 0;
+ has_fixes = 1;
}
}
@@ -569,32 +569,32 @@
CustomData *ldata, CustomData *pdata,
short do_verbose, const short do_fixes)
{
- int vfixed= 0, efixed= 0, lfixed = 0, pfixed = 0;
+ int vfixed = 0, efixed = 0, lfixed = 0, pfixed = 0;
- vfixed= mesh_validate_customdata(vdata, do_verbose, do_fixes);
- efixed= mesh_validate_customdata(edata, do_verbose, do_fixes);
- lfixed= mesh_validate_customdata(ldata, do_verbose, do_fixes);
- pfixed= mesh_validate_customdata(pdata, do_verbose, do_fixes);
+ vfixed = mesh_validate_customdata(vdata, do_verbose, do_fixes);
+ efixed = mesh_validate_customdata(edata, do_verbose, do_fixes);
+ lfixed = mesh_validate_customdata(ldata, do_verbose, do_fixes);
+ pfixed = mesh_validate_customdata(pdata, do_verbose, do_fixes);
return vfixed || efixed || lfixed || pfixed;
}
int BKE_mesh_validate(Mesh *me, int do_verbose)
{
- int layers_fixed= 0, arrays_fixed= 0;
+ int layers_fixed = 0, arrays_fixed = 0;
if (do_verbose) {
- printf("MESH: %s\n", me->id.name+2);
+ printf("MESH: %s\n", me->id.name + 2);
}
- layers_fixed= BKE_mesh_validate_all_customdata(&me->vdata, &me->edata, &me->ldata, &me->pdata, do_verbose, TRUE);
- arrays_fixed= BKE_mesh_validate_arrays(me,
- me->mvert, me->totvert,
- me->medge, me->totedge,
- me->mloop, me->totloop,
- me->mpoly, me->totpoly,
- me->dvert,
- do_verbose, TRUE);
+ layers_fixed = BKE_mesh_validate_all_customdata(&me->vdata, &me->edata, &me->ldata, &me->pdata, do_verbose, TRUE);
+ arrays_fixed = BKE_mesh_validate_arrays(me,
+ me->mvert, me->totvert,
+ me->medge, me->totedge,
+ me->mloop, me->totloop,
+ me->mpoly, me->totpoly,
+ me->dvert,
+ do_verbose, TRUE);
if (layers_fixed || arrays_fixed) {
DAG_id_tag_update(&me->id, OB_RECALC_DATA);
@@ -624,26 +624,26 @@
int i, totedge, totpoly = mesh->totpoly;
int med_index;
- if (mesh->totedge==0)
- update= 0;
+ if (mesh->totedge == 0)
+ update = FALSE;
if (update) {
/* assume existing edges are valid
* useful when adding more faces and generating edges from them */
- med= mesh->medge;
- for (i= 0; i<mesh->totedge; i++, med++)
+ med = mesh->medge;
+ for (i = 0; i < mesh->totedge; i++, med++)
BLI_edgehash_insert(eh, med->v1, med->v2, med);
}
/* mesh loops (bmesh only) */
- for (i=0; i < totpoly; i++, mp++) {
- MLoop *l= &mesh->mloop[mp->loopstart];
- int j, l_prev= (l + (mp->totloop-1))->v;
- for (j=0; j < mp->totloop; j++, l++) {
+ for (i = 0; i < totpoly; i++, mp++) {
+ MLoop *l = &mesh->mloop[mp->loopstart];
+ int j, l_prev = (l + (mp->totloop - 1))->v;
+ for (j = 0; j < mp->totloop; j++, l++) {
if (!BLI_edgehash_haskey(eh, l_prev, l->v)) {
BLI_edgehash_insert(eh, l_prev, l->v, NULL);
}
- l_prev= l->v;
+ l_prev = l->v;
}
}
@@ -656,14 +656,14 @@
ehi = BLI_edgehashIterator_new(eh);
med = CustomData_get_layer(&edata, CD_MEDGE);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list