[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37100] branches/soc-2011-radish/source/ blender/editors/sculpt_paint/paint_vertex.c: My earlier custom auto normalize is no longer necessary to maintain inner group ratios (since the system changed)

Jason Hays jason_hays22 at mymail.eku.edu
Thu Jun 2 16:15:07 CEST 2011


Revision: 37100
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37100
Author:   jason_hays22
Date:     2011-06-02 14:15:07 +0000 (Thu, 02 Jun 2011)
Log Message:
-----------
My earlier custom auto normalize is no longer necessary to maintain inner group ratios (since the system changed)

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-06-02 13:03:46 UTC (rev 37099)
+++ branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_vertex.c	2011-06-02 14:15:07 UTC (rev 37100)
@@ -1041,7 +1041,7 @@
 I need to resolve a precision error issue, however:
 dividing can cause the weights to drop to 0
 */
-static void do_wp_auto_normalize_locked_groups(Mesh *me, MDeformVert *dvert, char* map)
+/*static void do_wp_auto_normalize_locked_groups(Mesh *me, MDeformVert *dvert, char* map)
 {
 	float highestSum = 0.0f;
 	float currentSum;
@@ -1081,7 +1081,7 @@
 			}
 		}
 	}
-}
+}*/
 /* Jason was here */
 /*static char get_locked_flag(Object *ob, int vgroup)
 {
@@ -1096,7 +1096,7 @@
 	return 0;
 }*/
 /* Jason was here */
-static int locked_group_exists(Object *ob)
+/*static int locked_group_exists(Object *ob)
 {
 	bDeformGroup *defgroup = ob->defbase.first;
 	while(defgroup) {
@@ -1106,7 +1106,7 @@
 		defgroup = defgroup->next;
 	}
 	return FALSE;
-}
+}*/
 /* Jason was here */
 /*
 See if the current deform group has a locked group
@@ -1277,11 +1277,11 @@
 			dw->weight = oldw;
 		} else if(bone_groups[dw->def_nr]) {
 			redistribute_weight_change(me->dvert+index, dw, oldw, flags, defcnt, bone_groups);
-			do_wp_auto_normalize_locked_groups(me, me->dvert, validmap);
+			//do_weight_paint_auto_normalize(me->dvert+index, vgroup, validmap);//do_wp_auto_normalize_locked_groups(me, me->dvert, validmap);
 		}
-	} else {
+	} //else if(bone_groups[dw->def_nr]) // should it be disabled for the active group if it is not a bone group
 		do_weight_paint_auto_normalize(me->dvert+index, vgroup, validmap);
-	}
+	
 }
 // Jason
 static char *wpaint_make_validmap(Object *ob);




More information about the Bf-blender-cvs mailing list