[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40328] branches/soc-2011-radish/source/ blender/editors/sculpt_paint/paint_vertex.c: style changes only
Campbell Barton
ideasman42 at gmail.com
Sun Sep 18 16:54:41 CEST 2011
Revision: 40328
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40328
Author: campbellbarton
Date: 2011-09-18 14:54:41 +0000 (Sun, 18 Sep 2011)
Log Message:
-----------
style changes only
Modified Paths:
--------------
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c
Modified: branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c 2011-09-18 14:48:15 UTC (rev 40327)
+++ branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c 2011-09-18 14:54:41 UTC (rev 40328)
@@ -1533,11 +1533,7 @@
MDeformVert dv= {NULL};
// Need to know which groups are bone groups
- if(validmap) {
- bone_groups = validmap;
- }else {
- bone_groups = wpaint_make_validmap(ob);
- }
+ bone_groups = validmap ? validmap : wpaint_make_validmap(ob);
if(wp->flag & VP_ONLYVGROUP) {
dw= defvert_find_index(me->dvert+index, vgroup);
@@ -1576,7 +1572,8 @@
if(i>=0) {
tdw = ((me->dvert+index)->dw+i);
tuw = defvert_verify_index(wp->wpaint_prev+index, tdw->def_nr);
- } else {
+ }
+ else {
change = 0;
}
}
@@ -1588,20 +1585,24 @@
if(change > oldChange) {
// reset the weights and use the new change
reset_to_prev(wp->wpaint_prev+index, me->dvert+index);
- } else {
+ }
+ else {
// the old change was more significant,
// so set the change to 0 so that it will not do another multi-paint
change = 0;
}
- } else {
+ }
+ else {
if(change < oldChange) {
reset_to_prev(wp->wpaint_prev+index, me->dvert+index);
- } else {
+ }
+ else {
change = 0;
}
}
}
- } else {
+ }
+ else {
change = 0;
}
}
@@ -1613,7 +1614,7 @@
oldChange = 0;
}
if(dv.dw) {
- MEM_freeN(dv.dw);
+ MEM_freeN`(dv.dw);
}
// dvert may have been altered greatly
dw = defvert_find_index(me->dvert+index, vgroup);
@@ -1622,10 +1623,7 @@
int j= mesh_get_x_mirror_vert(ob, index);
if(j>=0) {
/* copy, not paint again */
- if(vgroup_mirror != -1)
- uw= defvert_verify_index(me->dvert+j, vgroup_mirror);
- else
- uw= defvert_verify_index(me->dvert+j, vgroup);
+ uw= defvert_verify_index(me->dvert+j, (vgroup_mirror != -1) ? vgroup_mirror : vgroup);
/* Radish */
//uw->weight= dw->weight;
/* Radish */
More information about the Bf-blender-cvs
mailing list