Revision: 46716
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46716
Author: cyborgmuppet
Date: 2012-05-17 09:47:11 +0000 (Thu, 17 May 2012)
Log Message:
-----------
cleanup: Style = adding spaces around operators.
Modified Paths:
--------------
branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c
Modified:
branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c
===================================================================
--- branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c
2012-05-17 09:34:22 UTC (rev 46715)
+++ branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c
2012-05-17 09:47:11 UTC (rev 46716)
@@ -387,22 +387,22 @@
bDeformGroup *dg_src, *dg_dst;
/*get source deform group*/
- dg_src= BLI_findlink(&ob_src->defbase, (ob_src->actdef-1));
+ dg_src = BLI_findlink(&ob_src->defbase, (ob_src->actdef-1));
/*create new and overwrite vertex group on destination without data*/
ED_vgroup_delete(ob_dst, defgroup_find_name(ob_dst, dg_src->name));
ED_vgroup_add_name(ob_dst, dg_src->name);
/*get destination deformgroup*/
- dg_dst= defgroup_find_name(ob_dst, dg_src->name);
+ dg_dst = defgroup_find_name(ob_dst, dg_src->name);
/*get vertex group arrays*/
ED_vgroup_give_parray(ob_src->data, &dv_array_src, &dv_tot_src, FALSE);
ED_vgroup_give_parray(ob_dst->data, &dv_array_dst, &dv_tot_dst, FALSE);
/*get indexes of vertex groups*/
- index_src= BLI_findindex(&ob_src->defbase, dg_src);
- index_dst= BLI_findindex(&ob_dst->defbase, dg_dst);
+ index_src = BLI_findindex(&ob_src->defbase, dg_src);
+ index_dst = BLI_findindex(&ob_dst->defbase, dg_dst);
/*check if indices are matching, delete and return if not*/
if (ob_dst == ob_src || dv_tot_dst == 0 || (dv_tot_dst != dv_tot_src)
|| dv_array_src == NULL || dv_array_dst == NULL) {
@@ -411,10 +411,10 @@
}
/* loop through the vertices and copy weight*/
- for(i=0; i<dv_tot_dst; i++, dv_array_src++, dv_array_dst++) {
- dw_src= defvert_verify_index(*dv_array_src, index_src);
- dw_dst= defvert_verify_index(*dv_array_dst, index_dst);
- dw_dst->weight= dw_src->weight;
+ for(i = 0; i < dv_tot_dst; i++, dv_array_src++, dv_array_dst++) {
+ dw_src = defvert_verify_index(*dv_array_src, index_src);
+ dw_dst = defvert_verify_index(*dv_array_dst, index_dst);
+ dw_dst->weight = dw_src->weight;
}
return 1;
@@ -451,7 +451,7 @@
bDeformGroup *dg_src, *dg_dst;
/*get source deform group*/
- dg_src= BLI_findlink(&ob_src->defbase, (ob_src->actdef-1));
+ dg_src = BLI_findlink(&ob_src->defbase, (ob_src->actdef-1));
/*create new and overwrite vertex group on destination without data*/
if(!defgroup_find_name(ob_dst, dg_src->name) || mode == 1){
@@ -460,15 +460,15 @@
}
/*get destination deformgroup*/
- dg_dst= defgroup_find_name(ob_dst, dg_src->name);
+ dg_dst = defgroup_find_name(ob_dst, dg_src->name);
/*get vertex group arrays*/
ED_vgroup_give_parray(ob_src->data, &dv_array_src, &dv_tot_src, FALSE);
ED_vgroup_give_parray(ob_dst->data, &dv_array_dst, &dv_tot_dst, FALSE);
/*get indexes of vertex groups*/
- index_src= BLI_findindex(&ob_src->defbase, dg_src);
- index_dst= BLI_findindex(&ob_dst->defbase, dg_dst);
+ index_src = BLI_findindex(&ob_src->defbase, dg_src);
+ index_dst = BLI_findindex(&ob_dst->defbase, dg_dst);
/*check if indices are matching, delete and return if not*/
if (ob_dst == ob_src || dv_tot_dst == 0 || (dv_tot_dst != dv_tot_src)
|| dv_array_src == NULL || dv_array_dst == NULL) {
@@ -479,10 +479,10 @@
/* mode 1 == replace all weights*/
if(mode == 1){
/* loop through the vertices and copy weight*/
- for(i=0; i<dv_tot_dst; i++, dv_array_src++, dv_array_dst++) {
- dw_src= defvert_verify_index(*dv_array_src, index_src);
- dw_dst= defvert_verify_index(*dv_array_dst, index_dst);
- dw_dst->weight= dw_src->weight;
+ for(i = 0; i < dv_tot_dst; i++, dv_array_src++, dv_array_dst++){
+ dw_src = defvert_verify_index(*dv_array_src, index_src);
+ dw_dst = defvert_verify_index(*dv_array_dst, index_dst);
+ dw_dst->weight = dw_src->weight;
}
return 1;
}
@@ -490,11 +490,11 @@
/* mode 2 == replace null weights*/
else if(mode == 2){
/* loop through the vertices and copy weight*/
- for(i=0; i<dv_tot_dst; i++, dv_array_src++, dv_array_dst++) {
- dw_src= defvert_verify_index(*dv_array_src, index_src);
- dw_dst= defvert_verify_index(*dv_array_dst, index_dst);
+ for(i = 0; i < dv_tot_dst; i++, dv_array_src++, dv_array_dst++)
{
+ dw_src = defvert_verify_index(*dv_array_src, index_src);
+ dw_dst = defvert_verify_index(*dv_array_dst, index_dst);
/*check if destination weight is null or zero*/
- if(!dw_dst->weight || dw_dst->weight == 0)
dw_dst->weight= dw_src->weight;
+ if(!dw_dst->weight || dw_dst->weight == 0)
dw_dst->weight = dw_src->weight;
}
return 1;
}
@@ -502,11 +502,11 @@
/* mode 3 == replace selected weights*/
else if(mode == 3){
/* loop through the vertices and copy weight*/
- for(i=0; i<dv_tot_dst; i++, dv_array_src++, dv_array_dst++) {
- dw_src= defvert_verify_index(*dv_array_src, index_src);
- dw_dst= defvert_verify_index(*dv_array_dst, index_dst);
+ for(i = 0; i < dv_tot_dst; i++, dv_array_src++, dv_array_dst++)
{
+ dw_src = defvert_verify_index(*dv_array_src, index_src);
+ dw_dst = defvert_verify_index(*dv_array_dst, index_dst);
/*check if source vertex is selected*/
- if((*dv_array_src)->flag == 1) dw_dst->weight=
dw_src->weight; /*this does not work*/
+ if((*dv_array_src)->flag == 1) dw_dst->weight =
dw_src->weight; /*This does not work*/
}
return 1;
}
@@ -515,8 +515,8 @@
int ED_vgroup_transfer_weight_by_nearest_vertex_all(Object *ob_dst, Object
*ob_src, short mode)
{
- ob_dst= ob_dst;
- ob_src= ob_src;
+ ob_dst = ob_dst;
+ ob_src = ob_src;
return mode;
}
@@ -534,7 +534,7 @@
float tmp_co[3], tmp_mat[4][4];
/*get source deform group*/
- dg_src= BLI_findlink(&ob_src->defbase, (ob_src->actdef-1));
+ dg_src = BLI_findlink(&ob_src->defbase, (ob_src->actdef-1));
/*create new and overwrite vertex group on destination without data*/
if(!defgroup_find_name(ob_dst, dg_src->name) || mode == 1){
@@ -543,11 +543,11 @@
}
/*get destination deformgroup*/
- dg_dst= defgroup_find_name(ob_dst, dg_src->name);
+ dg_dst = defgroup_find_name(ob_dst, dg_src->name);
/*get meshes*/
- me_dst= ob_dst->data;
- dmesh_src= ob_src->derivedDeform;
+ me_dst = ob_dst->data;
+ dmesh_src = ob_src->derivedDeform;
/*make node tree*/
bvhtree_from_mesh_verts(&tree_mesh_src, dmesh_src, 0.0, 2, 6);
@@ -557,11 +557,11 @@
ED_vgroup_give_parray(ob_dst->data, &dv_array_dst, &dv_tot_dst, FALSE);
/*get indexes of vertex groups*/
- index_src= BLI_findindex(&ob_src->defbase, dg_src);
- index_dst= BLI_findindex(&ob_dst->defbase, dg_dst);
+ index_src = BLI_findindex(&ob_src->defbase, dg_src);
+ index_dst = BLI_findindex(&ob_dst->defbase, dg_dst);
/*get vertices*/
- mv_dst= me_dst->mvert;
+ mv_dst = me_dst->mvert;
/*prepare transformation matrix*/
/*this can be excluded to make a lazy feature that works better when
object centers relative to mesh is the same*/
@@ -571,17 +571,17 @@
/* mode 1 == replace all weights*/
if(mode == 1){
/* loop through the vertices and copy weight*/
- for(i=0; i < me_dst->totvert; i++, mv_dst++, dv_array_dst++){
+ for(i = 0; i < me_dst->totvert; i++, mv_dst++, dv_array_dst++){
/*reset nearest*/
- nearest.index= -1;
- nearest.dist= FLT_MAX;
+ nearest.index = -1;
+ nearest.dist = FLT_MAX;
/*transform into target space*/
mul_v3_m4v3(tmp_co, tmp_mat, mv_dst->co);
/*node tree accelerated search for closest vetex*/
BLI_bvhtree_find_nearest(tree_mesh_src.tree, tmp_co,
&nearest, tree_mesh_src.nearest_callback, &tree_mesh_src);
- dw_src=
defvert_verify_index(dv_array_src[nearest.index], index_src);
- dw_dst= defvert_verify_index(*dv_array_dst, index_dst);
- dw_dst->weight= dw_src->weight;
+ dw_src =
defvert_verify_index(dv_array_src[nearest.index], index_src);
+ dw_dst = defvert_verify_index(*dv_array_dst, index_dst);
+ dw_dst->weight = dw_src->weight;
}
/*free memory and return*/
free_bvhtree_from_mesh(&tree_mesh_src);
@@ -591,18 +591,18 @@
/* mode 2 == replace null weights*/
else if(mode == 2){
/* loop through the vertices and copy weight weight*/
- for(i=0; i < me_dst->totvert; i++, mv_dst++, dv_array_dst++){
+ for(i = 0; i < me_dst->totvert; i++, mv_dst++, dv_array_dst++){
/*reset nearest*/
- nearest.index= -1;
- nearest.dist= FLT_MAX;
+ nearest.index = -1;
+ nearest.dist = FLT_MAX;
/*transform into target space*/
mul_v3_m4v3(tmp_co, tmp_mat, mv_dst->co);
/*node tree accelerated search for closest vetex*/
BLI_bvhtree_find_nearest(tree_mesh_src.tree, tmp_co,
&nearest, tree_mesh_src.nearest_callback, &tree_mesh_src);
- dw_src=
defvert_verify_index(dv_array_src[nearest.index], index_src);
- dw_dst= defvert_verify_index(*dv_array_dst, index_dst);
+ dw_src =
defvert_verify_index(dv_array_src[nearest.index], index_src);
+ dw_dst = defvert_verify_index(*dv_array_dst, index_dst);
/*check if destination weight is null or zero*/
- if(!dw_dst->weight || dw_dst->weight == 0)
dw_dst->weight= dw_src->weight;
+ if(!dw_dst->weight || dw_dst->weight == 0)
dw_dst->weight = dw_src->weight;
}
/*free memory and return*/
free_bvhtree_from_mesh(&tree_mesh_src);
@@ -612,16 +612,16 @@
/* mode 3 == replace selected weights*/
else if(mode == 3){
/* loop through the vertices and copy weight*/
- for(i=0; i < me_dst->totvert; i++, mv_dst++, dv_array_dst++){
+ for(i = 0; i < me_dst->totvert; i++, mv_dst++, dv_array_dst++){
/*reset nearest*/
- nearest.index= -1;
- nearest.dist= FLT_MAX;
+ nearest.index = -1;
+ nearest.dist = FLT_MAX;
/*transform into target space*/
mul_v3_m4v3(tmp_co, tmp_mat, mv_dst->co);
/*node tree accelerated search for closest vetex*/
BLI_bvhtree_find_nearest(tree_mesh_src.tree, tmp_co,
&nearest, tree_mesh_src.nearest_callback, &tree_mesh_src);
- dw_src=
defvert_verify_index(dv_array_src[nearest.index], index_src);
- dw_dst= defvert_verify_index(*dv_array_dst, index_dst);
+ dw_src =
defvert_verify_index(dv_array_src[nearest.index], index_src);
+ dw_dst = defvert_verify_index(*dv_array_dst, index_dst);
/*dw_dst->weight= dw_src->weight;*//*TODO fix this*/
}
@@ -634,8 +634,8 @@
int ED_vgroup_transfer_weight_by_nearest_vertex_in_face_all(Object *ob_dst,
Object *ob_src, short mode)
{
- ob_dst= ob_dst;
- ob_src= ob_src;
+ ob_dst = ob_dst;
+ ob_src = ob_src;
return mode;
}
@@ -654,7 +654,7 @@
float dist_v1, dist_v2, dist_v3, dist_v4, tmp_co[3], tmp_mat[4][4];
/*get source deform group*/
- dg_src= BLI_findlink(&ob_src->defbase, (ob_src->actdef-1));
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
