[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45015] trunk/blender/source/blender/ blenkernel/intern/deform.c: style cleanup
Campbell Barton
ideasman42 at gmail.com
Tue Mar 20 05:09:55 CET 2012
Revision: 45015
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45015
Author: campbellbarton
Date: 2012-03-20 04:09:43 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/deform.c
Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c 2012-03-20 03:48:32 UTC (rev 45014)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c 2012-03-20 04:09:43 UTC (rev 45015)
@@ -49,10 +49,10 @@
{
bDeformGroup *defgroup, *defgroupn;
- outbase->first= outbase->last= NULL;
+ outbase->first = outbase->last = NULL;
- for (defgroup = inbase->first; defgroup; defgroup=defgroup->next) {
- defgroupn= defgroup_duplicate(defgroup);
+ for (defgroup = inbase->first; defgroup; defgroup = defgroup->next) {
+ defgroupn = defgroup_duplicate(defgroup);
BLI_addtail(outbase, defgroupn);
}
}
@@ -64,12 +64,12 @@
if (!ingroup)
return NULL;
- outgroup=MEM_callocN(sizeof(bDeformGroup), "copy deformGroup");
+ outgroup = MEM_callocN(sizeof(bDeformGroup), "copy deformGroup");
/* For now, just copy everything over. */
- memcpy (outgroup, ingroup, sizeof(bDeformGroup));
+ memcpy(outgroup, ingroup, sizeof(bDeformGroup));
- outgroup->next=outgroup->prev=NULL;
+ outgroup->next = outgroup->prev = NULL;
return outgroup;
}
@@ -86,9 +86,9 @@
MEM_freeN(dvert_dst->dw);
if (dvert_src->totweight)
- dvert_dst->dw= MEM_dupallocN(dvert_src->dw);
+ dvert_dst->dw = MEM_dupallocN(dvert_src->dw);
else
- dvert_dst->dw= NULL;
+ dvert_dst->dw = NULL;
dvert_dst->totweight = dvert_src->totweight;
}
@@ -102,19 +102,19 @@
{
MDeformWeight *dw_src, *dw_dst;
- dw_src= defvert_find_index(dvert_src, defgroup);
+ dw_src = defvert_find_index(dvert_src, defgroup);
if (dw_src) {
/* source is valid, verify destination */
- dw_dst= defvert_verify_index(dvert_dst, defgroup);
- dw_dst->weight= dw_src->weight;
+ dw_dst = defvert_verify_index(dvert_dst, defgroup);
+ dw_dst->weight = dw_src->weight;
}
else {
/* source was NULL, assign zero, could also remove */
- dw_dst= defvert_find_index(dvert_dst, defgroup);
+ dw_dst = defvert_find_index(dvert_dst, defgroup);
if (dw_dst) {
- dw_dst->weight= 0.0f;
+ dw_dst->weight = 0.0f;
}
}
}
@@ -127,13 +127,13 @@
if (dvert_src->totweight && dvert_dst->totweight) {
int i;
MDeformWeight *dw_src;
- for (i=0, dw_src=dvert_src->dw; i < dvert_src->totweight; i++, dw_src++) {
+ for (i = 0, dw_src = dvert_src->dw; i < dvert_src->totweight; i++, dw_src++) {
MDeformWeight *dw_dst;
- if (use_verify) dw_dst= defvert_verify_index(dvert_dst, dw_src->def_nr);
- else dw_dst= defvert_find_index(dvert_dst, dw_src->def_nr);
+ if (use_verify) dw_dst = defvert_verify_index(dvert_dst, dw_src->def_nr);
+ else dw_dst = defvert_find_index(dvert_dst, dw_src->def_nr);
if (dw_dst) {
- dw_dst->weight= dw_src->weight;
+ dw_dst->weight = dw_src->weight;
}
}
}
@@ -146,14 +146,14 @@
if (dvert_src->totweight && dvert_dst->totweight) {
int i;
MDeformWeight *dw_src;
- for (i=0, dw_src=dvert_src->dw; i < dvert_src->totweight; i++, dw_src++) {
+ for (i = 0, dw_src = dvert_src->dw; i < dvert_src->totweight; i++, dw_src++) {
if (dw_src->def_nr < flip_map_len) {
MDeformWeight *dw_dst;
- if (use_verify) dw_dst= defvert_verify_index(dvert_dst, flip_map[dw_src->def_nr]);
- else dw_dst= defvert_find_index(dvert_dst, flip_map[dw_src->def_nr]);
+ if (use_verify) dw_dst = defvert_verify_index(dvert_dst, flip_map[dw_src->def_nr]);
+ else dw_dst = defvert_find_index(dvert_dst, flip_map[dw_src->def_nr]);
if (dw_dst) {
- dw_dst->weight= dw_src->weight;
+ dw_dst->weight = dw_src->weight;
}
}
}
@@ -163,11 +163,11 @@
/* be sure all flip_map values are valid */
void defvert_remap(MDeformVert *dvert, int *map, const int map_len)
{
- MDeformWeight *dw= dvert->dw;
+ MDeformWeight *dw = dvert->dw;
unsigned int i;
- for (i= dvert->totweight; i != 0; i--, dw++) {
+ for (i = dvert->totweight; i != 0; i--, dw++) {
if (dw->def_nr < map_len) {
- dw->def_nr= map[dw->def_nr];
+ dw->def_nr = map[dw->def_nr];
/* just in case */
BLI_assert(dw->def_nr >= 0);
@@ -180,21 +180,21 @@
if (dvert->totweight <= 0) {
/* nothing */
}
- else if (dvert->totweight==1) {
- dvert->dw[0].weight= 1.0f;
+ else if (dvert->totweight == 1) {
+ dvert->dw[0].weight = 1.0f;
}
else {
MDeformWeight *dw;
unsigned int i;
- float tot_weight= 0.0f;
+ float tot_weight = 0.0f;
- for (i= dvert->totweight, dw= dvert->dw; i != 0; i--, dw++) {
+ for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
tot_weight += dw->weight;
}
if (tot_weight > 0.0f) {
- float scalar= 1.0f / tot_weight;
- for (i= dvert->totweight, dw= dvert->dw; i != 0; i--, dw++) {
+ float scalar = 1.0f / tot_weight;
+ for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
dw->weight *= scalar;
/* in case of division errors with very low weights */
@@ -209,22 +209,22 @@
if (dvert->totweight <= 0) {
/* nothing */
}
- else if (dvert->totweight==1) {
- dvert->dw[0].weight= 1.0f;
+ else if (dvert->totweight == 1) {
+ dvert->dw[0].weight = 1.0f;
}
else {
MDeformWeight *dw_lock = NULL;
MDeformWeight *dw;
unsigned int i;
- float tot_weight= 0.0f;
- float lock_iweight= 1.0f;
+ float tot_weight = 0.0f;
+ float lock_iweight = 1.0f;
- for (i= dvert->totweight, dw= dvert->dw; i != 0; i--, dw++) {
+ for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
if(dw->def_nr != def_nr_lock) {
tot_weight += dw->weight;
}
else {
- dw_lock= dw;
+ dw_lock = dw;
lock_iweight = (1.0f - dw_lock->weight);
CLAMP(lock_iweight, 0.0f, 1.0f);
}
@@ -233,8 +233,8 @@
if (tot_weight > 0.0f) {
/* paranoid, should be 1.0 but in case of float error clamp anyway */
- float scalar= (1.0f / tot_weight) * lock_iweight;
- for (i= dvert->totweight, dw= dvert->dw; i != 0; i--, dw++) {
+ float scalar = (1.0f / tot_weight) * lock_iweight;
+ for (i = dvert->totweight, dw = dvert->dw; i != 0; i--, dw++) {
if(dw != dw_lock) {
dw->weight *= scalar;
@@ -251,10 +251,10 @@
MDeformWeight *dw;
int i;
- for (dw= dvert->dw, i=0; i<dvert->totweight; dw++, i++) {
+ for (dw = dvert->dw, i = 0; i<dvert->totweight; dw++, i++) {
if (dw->def_nr < flip_map_len) {
if (flip_map[dw->def_nr] >= 0) {
- dw->def_nr= flip_map[dw->def_nr];
+ dw->def_nr = flip_map[dw->def_nr];
}
}
}
@@ -267,7 +267,7 @@
int i, totweight = dvert->totweight;
/* copy weights */
- for (dw = dvert->dw, i=0; i < totweight; dw++, i++) {
+ for (dw = dvert->dw, i = 0; i < totweight; dw++, i++) {
if (dw->def_nr < flip_map_len) {
if (flip_map[dw->def_nr] >= 0) {
/* error checkers complain of this but we'll never get NULL return */
@@ -292,7 +292,7 @@
*/
bDeformGroup *curdef;
- for (curdef = ob->defbase.first; curdef; curdef=curdef->next) {
+ for (curdef = ob->defbase.first; curdef; curdef = curdef->next) {
if (!strcmp(curdef->name, name)) {
return curdef;
}
@@ -311,7 +311,7 @@
int def_nr;
if (name && name[0] != '\0') {
- for (curdef=ob->defbase.first, def_nr=0; curdef; curdef=curdef->next, def_nr++) {
+ for (curdef = ob->defbase.first, def_nr = 0; curdef; curdef = curdef->next, def_nr++) {
if (!strcmp(curdef->name, name))
return def_nr;
}
@@ -323,33 +323,33 @@
/* note, must be freed */
int *defgroup_flip_map(Object *ob, int *flip_map_len, int use_default)
{
- int defbase_tot= *flip_map_len= BLI_countlist(&ob->defbase);
+ int defbase_tot = *flip_map_len = BLI_countlist(&ob->defbase);
- if (defbase_tot==0) {
+ if (defbase_tot == 0) {
return NULL;
}
else {
bDeformGroup *dg;
char name[sizeof(dg->name)];
- int i, flip_num, *map= MEM_mallocN(defbase_tot * sizeof(int), __func__);
+ int i, flip_num, *map = MEM_mallocN(defbase_tot * sizeof(int), __func__);
- for (i=0; i < defbase_tot; i++) {
- map[i]= -1;
+ for (i = 0; i < defbase_tot; i++) {
+ map[i] = -1;
}
- for (dg=ob->defbase.first, i=0; dg; dg=dg->next, i++) {
+ for (dg = ob->defbase.first, i = 0; dg; dg = dg->next, i++) {
if (map[i] == -1) { /* may be calculated previously */
/* in case no valid value is found, use this */
if (use_default)
- map[i]= i;
+ map[i] = i;
flip_side_name(name, dg->name, FALSE);
if (strcmp(name, dg->name)) {
- flip_num= defgroup_name_index(ob, name);
+ flip_num = defgroup_name_index(ob, name);
if (flip_num >= 0) {
- map[i]= flip_num;
- map[flip_num]= i; /* save an extra lookup */
+ map[i] = flip_num;
+ map[flip_num] = i; /* save an extra lookup */
}
}
}
@@ -361,30 +361,29 @@
/* note, must be freed */
int *defgroup_flip_map_single(Object *ob, int *flip_map_len, int use_default, int defgroup)
{
- int defbase_tot= *flip_map_len= BLI_countlist(&ob->defbase);
+ int defbase_tot = *flip_map_len = BLI_countlist(&ob->defbase);
- if (defbase_tot==0) {
+ if (defbase_tot == 0) {
return NULL;
}
else {
bDeformGroup *dg;
char name[sizeof(dg->name)];
- int i, flip_num, *map= MEM_mallocN(defbase_tot * sizeof(int), __func__);
+ int i, flip_num, *map = MEM_mallocN(defbase_tot * sizeof(int), __func__);
- for (i=0; i < defbase_tot; i++) {
- if (use_default) map[i]= i;
- else map[i]= -1;
+ for (i = 0; i < defbase_tot; i++) {
+ map[i] = use_default ? i : -1;
}
- dg= BLI_findlink(&ob->defbase, defgroup);
+ dg = BLI_findlink(&ob->defbase, defgroup);
flip_side_name(name, dg->name, FALSE);
if (strcmp(name, dg->name)) {
- flip_num= defgroup_name_index(ob, name);
+ flip_num = defgroup_name_index(ob, name);
if (flip_num >= 0) {
- map[defgroup]= flip_num;
- map[flip_num]= defgroup;
+ map[defgroup] = flip_num;
+ map[flip_num] = defgroup;
}
}
@@ -394,7 +393,7 @@
int defgroup_flip_index(Object *ob, int index, int use_default)
{
- bDeformGroup *dg= BLI_findlink(&ob->defbase, index);
+ bDeformGroup *dg = BLI_findlink(&ob->defbase, index);
int flip_index = -1;
if (dg) {
@@ -402,18 +401,18 @@
flip_side_name(name, dg->name, 0);
if (strcmp(name, dg->name))
- flip_index= defgroup_name_index(ob, name);
+ flip_index = defgroup_name_index(ob, name);
}
- return (flip_index==-1 && use_default) ? index : flip_index;
+ return (flip_index == -1 && use_default) ? index : flip_index;
}
static int defgroup_find_name_dupe(const char *name, bDeformGroup *dg, Object *ob)
{
bDeformGroup *curdef;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list