[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41407] trunk/blender/source/blender: use_verify option to defvert_sync_mapped and defvert_sync was flipped, also minor edits to defvert_verify_index() - no functional change.

[Campbell Barton]

Revision: 41407
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41407
Author:   campbellbarton
Date:     2011-10-31 06:13:20 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
use_verify option to defvert_sync_mapped and defvert_sync was flipped, also minor edits to defvert_verify_index() - no functional change.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/deform.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c

Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c	2011-10-31 03:55:01 UTC (rev 41406)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c	2011-10-31 06:13:20 UTC (rev 41407)
@@ -104,8 +104,8 @@
 		MDeformWeight *dw;
 		for(i=0, dw=dvert->dw; i < dvert->totweight; i++, dw++) {
 			MDeformWeight *dw_r;
-			if(use_verify)	dw_r= defvert_find_index(dvert_r, dw->def_nr);
-			else			dw_r= defvert_verify_index(dvert_r, dw->def_nr);
+			if(use_verify)	dw_r= defvert_verify_index(dvert_r, dw->def_nr);
+			else			dw_r= defvert_find_index(dvert_r, dw->def_nr);
 
 			if(dw_r) {
 				dw_r->weight= dw->weight;
@@ -123,8 +123,8 @@
 		for (i=0, dw=dvert->dw; i < dvert->totweight; i++, dw++) {
 			if (dw->def_nr < flip_map_len) {
 				MDeformWeight *dw_r;
-				if(use_verify)	dw_r= defvert_find_index(dvert_r, flip_map[dw->def_nr]);
-				else			dw_r= defvert_verify_index(dvert_r, flip_map[dw->def_nr]);
+				if(use_verify)	dw_r= defvert_verify_index(dvert_r, flip_map[dw->def_nr]);
+				else			dw_r= defvert_find_index(dvert_r, flip_map[dw->def_nr]);
 
 				if(dw_r) {
 					dw_r->weight= dw->weight;
@@ -487,25 +487,25 @@
 	MDeformWeight *newdw;
 
 	/* do this check always, this function is used to check for it */
-	if(!dv || defgroup<0)
+	if(!dv || defgroup < 0)
 		return NULL;
 
-	newdw = defvert_find_index(dv, defgroup);
+	newdw= defvert_find_index(dv, defgroup);
 	if(newdw)
 		return newdw;
 
-	newdw = MEM_callocN(sizeof(MDeformWeight)*(dv->totweight+1), "deformWeight");
-	if(dv->dw) {
+	newdw= MEM_callocN(sizeof(MDeformWeight)*(dv->totweight+1), "deformWeight");
+	if (dv->dw) {
 		memcpy(newdw, dv->dw, sizeof(MDeformWeight)*dv->totweight);
 		MEM_freeN(dv->dw);
 	}
-	dv->dw=newdw;
-
-	dv->dw[dv->totweight].weight=0.0f;
-	dv->dw[dv->totweight].def_nr=defgroup;
+	dv->dw= newdw;
+	newdw += dv->totweight;
+	newdw->weight= 0.0f;
+	newdw->def_nr= defgroup;
 	/* Group index */
 
 	dv->totweight++;
 
-	return dv->dw+(dv->totweight-1);
+	return newdw;
 }

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c	2011-10-31 03:55:01 UTC (rev 41406)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c	2011-10-31 06:13:20 UTC (rev 41407)
@@ -366,6 +366,7 @@
 {
 	Object *ob= CTX_data_active_object(C);
 	paintface_deselect_all_visible(ob, RNA_enum_get(op->ptr, "action"), TRUE);
+	paintface_flush_flags(ob);
 	ED_region_tag_redraw(CTX_wm_region(C));
 	return OPERATOR_FINISHED;
 }