[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45285] trunk/blender/source/blender/ editors/util: style cleanup
Campbell Barton
ideasman42 at gmail.com
Fri Mar 30 12:00:31 CEST 2012
Revision: 45285
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45285
Author: campbellbarton
Date: 2012-03-30 10:00:20 +0000 (Fri, 30 Mar 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/editors/util/crazyspace.c
trunk/blender/source/blender/editors/util/ed_util.c
trunk/blender/source/blender/editors/util/editmode_undo.c
trunk/blender/source/blender/editors/util/numinput.c
trunk/blender/source/blender/editors/util/undo.c
Modified: trunk/blender/source/blender/editors/util/crazyspace.c
===================================================================
--- trunk/blender/source/blender/editors/util/crazyspace.c 2012-03-30 09:33:12 UTC (rev 45284)
+++ trunk/blender/source/blender/editors/util/crazyspace.c 2012-03-30 10:00:20 UTC (rev 45285)
@@ -54,7 +54,7 @@
short *flags;
} MappedUserData;
-#define TAN_MAKE_VEC(a, b, c) a[0]= b[0] + 0.2f*(b[0]-c[0]); a[1]= b[1] + 0.2f*(b[1]-c[1]); a[2]= b[2] + 0.2f*(b[2]-c[2])
+#define TAN_MAKE_VEC(a, b, c) a[0] = b[0] + 0.2f * (b[0] - c[0]); a[1] = b[1] + 0.2f * (b[1] - c[1]); a[2] = b[2] + 0.2f * (b[2] - c[2])
static void set_crazy_vertex_quat(float *quat, float *v1, float *v2, float *v3, float *def1, float *def2, float *def3)
{
float vecu[3], vecv[3];
@@ -62,11 +62,11 @@
TAN_MAKE_VEC(vecu, v1, v2);
TAN_MAKE_VEC(vecv, v1, v3);
- tri_to_quat( q1,v1, vecu, vecv);
+ tri_to_quat(q1, v1, vecu, vecv);
TAN_MAKE_VEC(vecu, def1, def2);
TAN_MAKE_VEC(vecv, def1, def3);
- tri_to_quat( q2,def1, vecu, vecv);
+ tri_to_quat(q2, def1, vecu, vecv);
sub_qt_qtqt(quat, q2, q1);
}
@@ -74,15 +74,15 @@
static void make_vertexcos__mapFunc(void *userData, int index, float *co, float *UNUSED(no_f), short *UNUSED(no_s))
{
- MappedUserData *mappedData= (MappedUserData*)userData;
+ MappedUserData *mappedData = (MappedUserData *)userData;
float *vec = mappedData->vertexcos;
- vec+= 3*index;
+ vec += 3 * index;
if (!mappedData->flags[index]) {
/* we need coord from prototype vertex, not it clones or images,
* suppose they stored in the beginning of vertex array stored in DM */
copy_v3_v3(vec, co);
- mappedData->flags[index]= 1;
+ mappedData->flags[index] = 1;
}
}
@@ -91,11 +91,11 @@
ModifierData *md;
int disabled = 0;
- for (md=ob->modifiers.first; md; md=md->next)
- if (md->type==eModifierType_Subsurf)
+ for (md = ob->modifiers.first; md; md = md->next)
+ if (md->type == eModifierType_Subsurf)
if (md->mode & eModifierMode_OnCage) {
md->mode ^= eModifierMode_DisableTemporary;
- disabled= 1;
+ disabled = 1;
}
return disabled;
@@ -104,10 +104,10 @@
/* disable subsurf temporal, get mapped cos, and enable it */
float *crazyspace_get_mapped_editverts(Scene *scene, Object *obedit)
{
- Mesh *me= obedit->data;
+ Mesh *me = obedit->data;
DerivedMesh *dm;
float *vertexcos;
- int nverts= me->edit_btmesh->bm->totvert;
+ int nverts = me->edit_btmesh->bm->totvert;
short *flags;
MappedUserData userData;
@@ -118,13 +118,13 @@
}
/* now get the cage */
- dm= editbmesh_get_derived_cage(scene, obedit, me->edit_btmesh, CD_MASK_BAREMESH);
+ dm = editbmesh_get_derived_cage(scene, obedit, me->edit_btmesh, CD_MASK_BAREMESH);
- vertexcos= MEM_callocN(3*sizeof(float)*nverts, "vertexcos map");
- flags= MEM_callocN(sizeof(short)*nverts, "vertexcos flags");
+ vertexcos = MEM_callocN(3 * sizeof(float) * nverts, "vertexcos map");
+ flags = MEM_callocN(sizeof(short) * nverts, "vertexcos flags");
- userData.vertexcos= vertexcos;
- userData.flags= flags;
+ userData.vertexcos = vertexcos;
+ userData.flags = flags;
dm->foreachMappedVert(dm, make_vertexcos__mapFunc, &userData);
dm->release(dm);
@@ -143,31 +143,33 @@
BMIter iter, liter;
BMLoop *l;
float *v1, *v2, *v3, *co1, *co2, *co3;
- int *vert_table = MEM_callocN(sizeof(int)*em->bm->totvert, "vert_table");
+ int *vert_table = MEM_callocN(sizeof(int) * em->bm->totvert, "vert_table");
int index = 0;
BM_mesh_elem_index_ensure(em->bm, BM_VERT);
- BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
+ BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL)
+ {
if (!BM_elem_flag_test(v, BM_ELEM_SELECT) || BM_elem_flag_test(v, BM_ELEM_HIDDEN))
continue;
- BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_VERT, v) {
+ BM_ITER(l, &liter, em->bm, BM_LOOPS_OF_VERT, v)
+ {
BMLoop *l2 = BM_face_other_edge_loop(l->f, l->e, v);
/* retrieve mapped coordinates */
- v1= mappedcos + 3*BM_elem_index_get(l->v);
- v2= mappedcos + 3*BM_elem_index_get(BM_edge_other_vert(l2->e, l->v));
- v3= mappedcos + 3*BM_elem_index_get(BM_edge_other_vert(l->e, l->v));
+ v1 = mappedcos + 3 * BM_elem_index_get(l->v);
+ v2 = mappedcos + 3 * BM_elem_index_get(BM_edge_other_vert(l2->e, l->v));
+ v3 = mappedcos + 3 * BM_elem_index_get(BM_edge_other_vert(l->e, l->v));
+
+ co1 = (origcos) ? origcos + 3 * BM_elem_index_get(l->v) : l->v->co;
+ co2 = (origcos) ? origcos + 3 * BM_elem_index_get(BM_edge_other_vert(l2->e, l->v)) : BM_edge_other_vert(l2->e, l->v)->co;
+ co3 = (origcos) ? origcos + 3 * BM_elem_index_get(BM_edge_other_vert(l->e, l->v)) : BM_edge_other_vert(l->e, l->v)->co;
- co1= (origcos)? origcos + 3*BM_elem_index_get(l->v) : l->v->co;
- co2= (origcos)? origcos + 3*BM_elem_index_get(BM_edge_other_vert(l2->e, l->v)) : BM_edge_other_vert(l2->e, l->v)->co;
- co3= (origcos)? origcos + 3*BM_elem_index_get(BM_edge_other_vert(l->e, l->v)) : BM_edge_other_vert(l->e, l->v)->co;
-
set_crazy_vertex_quat(quats, v1, v2, v3, co1, co2, co3);
- quats+= 4;
+ quats += 4;
- vert_table[BM_elem_index_get(l->v)] = index+1;
+ vert_table[BM_elem_index_get(l->v)] = index + 1;
index++;
break; /*just do one corner*/
@@ -177,9 +179,9 @@
index = 0;
BM_ITER(v, &iter, em->bm, BM_VERTS_OF_MESH, NULL) {
if (vert_table[index] != 0)
- BM_elem_index_set(v, vert_table[index]-1); /* set_dirty! */
+ BM_elem_index_set(v, vert_table[index] - 1); /* set_dirty! */
else
- BM_elem_index_set(v, -1); /* set_dirty! */
+ BM_elem_index_set(v, -1); /* set_dirty! */
index++;
}
@@ -191,69 +193,69 @@
BMEditFace *efa;
BMIter iter;
float *v1, *v2, *v3, *v4, *co1, *co2, *co3, *co4;
- intptr_t index= 0;
+ intptr_t index = 0;
/* two abused locations in vertices */
- for (eve= em->verts.first; eve; eve= eve->next, index++) {
+ for (eve = em->verts.first; eve; eve = eve->next, index++) {
eve->tmp.p = NULL;
- eve->prev= (EditVert *)index;
+ eve->prev = (EditVert *)index;
}
/* first store two sets of tangent vectors in vertices, we derive it just from the face-edges */
- for (efa= em->faces.first; efa; efa= efa->next) {
+ for (efa = em->faces.first; efa; efa = efa->next) {
/* retrieve mapped coordinates */
- v1= mappedcos + 3*(intptr_t)(efa->v1->prev);
- v2= mappedcos + 3*(intptr_t)(efa->v2->prev);
- v3= mappedcos + 3*(intptr_t)(efa->v3->prev);
+ v1 = mappedcos + 3 * (intptr_t)(efa->v1->prev);
+ v2 = mappedcos + 3 * (intptr_t)(efa->v2->prev);
+ v3 = mappedcos + 3 * (intptr_t)(efa->v3->prev);
- co1= (origcos)? origcos + 3*(intptr_t)(efa->v1->prev): efa->v1->co;
- co2= (origcos)? origcos + 3*(intptr_t)(efa->v2->prev): efa->v2->co;
- co3= (origcos)? origcos + 3*(intptr_t)(efa->v3->prev): efa->v3->co;
+ co1 = (origcos) ? origcos + 3 * (intptr_t)(efa->v1->prev) : efa->v1->co;
+ co2 = (origcos) ? origcos + 3 * (intptr_t)(efa->v2->prev) : efa->v2->co;
+ co3 = (origcos) ? origcos + 3 * (intptr_t)(efa->v3->prev) : efa->v3->co;
- if (efa->v2->tmp.p==NULL && efa->v2->f1) {
+ if (efa->v2->tmp.p == NULL && efa->v2->f1) {
set_crazy_vertex_quat(quats, co2, co3, co1, v2, v3, v1);
- efa->v2->tmp.p= (void*)quats;
- quats+= 4;
+ efa->v2->tmp.p = (void *)quats;
+ quats += 4;
}
if (efa->v4) {
- v4= mappedcos + 3*(intptr_t)(efa->v4->prev);
- co4= (origcos)? origcos + 3*(intptr_t)(efa->v4->prev): efa->v4->co;
+ v4 = mappedcos + 3 * (intptr_t)(efa->v4->prev);
+ co4 = (origcos) ? origcos + 3 * (intptr_t)(efa->v4->prev) : efa->v4->co;
- if (efa->v1->tmp.p==NULL && efa->v1->f1) {
+ if (efa->v1->tmp.p == NULL && efa->v1->f1) {
set_crazy_vertex_quat(quats, co1, co2, co4, v1, v2, v4);
- efa->v1->tmp.p= (void*)quats;
- quats+= 4;
+ efa->v1->tmp.p = (void *)quats;
+ quats += 4;
}
- if (efa->v3->tmp.p==NULL && efa->v3->f1) {
+ if (efa->v3->tmp.p == NULL && efa->v3->f1) {
set_crazy_vertex_quat(quats, co3, co4, co2, v3, v4, v2);
- efa->v3->tmp.p= (void*)quats;
- quats+= 4;
+ efa->v3->tmp.p = (void *)quats;
+ quats += 4;
}
- if (efa->v4->tmp.p==NULL && efa->v4->f1) {
+ if (efa->v4->tmp.p == NULL && efa->v4->f1) {
set_crazy_vertex_quat(quats, co4, co1, co3, v4, v1, v3);
- efa->v4->tmp.p= (void*)quats;
- quats+= 4;
+ efa->v4->tmp.p = (void *)quats;
+ quats += 4;
}
}
else {
- if (efa->v1->tmp.p==NULL && efa->v1->f1) {
+ if (efa->v1->tmp.p == NULL && efa->v1->f1) {
set_crazy_vertex_quat(quats, co1, co2, co3, v1, v2, v3);
- efa->v1->tmp.p= (void*)quats;
- quats+= 4;
+ efa->v1->tmp.p = (void *)quats;
+ quats += 4;
}
- if (efa->v3->tmp.p==NULL && efa->v3->f1) {
+ if (efa->v3->tmp.p == NULL && efa->v3->f1) {
set_crazy_vertex_quat(quats, co3, co1, co2, v3, v1, v2);
- efa->v3->tmp.p= (void*)quats;
- quats+= 4;
+ efa->v3->tmp.p = (void *)quats;
+ quats += 4;
}
}
}
/* restore abused prev pointer */
- for (prev= NULL, eve= em->verts.first; eve; prev= eve, eve= eve->next)
- eve->prev= prev;
+ for (prev = NULL, eve = em->verts.first; eve; prev = eve, eve = eve->next)
+ eve->prev = prev;
#endif
}
@@ -266,61 +268,61 @@
MFace *mface;
float *v1, *v2, *v3, *v4, *co1, *co2, *co3, *co4;
- mvert= me->mvert;
- for (i=0; i<me->totvert; i++, mvert++)
- mvert->flag&= ~ME_VERT_TMP_TAG;
+ mvert = me->mvert;
+ for (i = 0; i < me->totvert; i++, mvert++)
+ mvert->flag &= ~ME_VERT_TMP_TAG;
/* first store two sets of tangent vectors in vertices, we derive it just from the face-edges */
- mvert= me->mvert;
- mface= me->mface;
- for (i=0; i<me->totface; i++, mface++) {
+ mvert = me->mvert;
+ mface = me->mface;
+ for (i = 0; i < me->totface; i++, mface++) {
/* retrieve mapped coordinates */
- v1= mappedcos + 3*mface->v1;
- v2= mappedcos + 3*mface->v2;
- v3= mappedcos + 3*mface->v3;
+ v1 = mappedcos + 3 * mface->v1;
+ v2 = mappedcos + 3 * mface->v2;
+ v3 = mappedcos + 3 * mface->v3;
- co1= (origcos)? origcos + 3*mface->v1: mvert[mface->v1].co;
- co2= (origcos)? origcos + 3*mface->v2: mvert[mface->v2].co;
- co3= (origcos)? origcos + 3*mface->v3: mvert[mface->v3].co;
+ co1 = (origcos) ? origcos + 3 * mface->v1 : mvert[mface->v1].co;
+ co2 = (origcos) ? origcos + 3 * mface->v2 : mvert[mface->v2].co;
+ co3 = (origcos) ? origcos + 3 * mface->v3 : mvert[mface->v3].co;
- if ((mvert[mface->v2].flag&ME_VERT_TMP_TAG)==0) {
- set_crazy_vertex_quat(&quats[mface->v2*4], co2, co3, co1, v2, v3, v1);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list