[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30365] branches/soc-2010-jwilkins/source/ blender/editors: * smooth strengths below .5 had no effect

[Jason Wilkins]

Revision: 30365
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30365
Author:   jwilkins
Date:     2010-07-15 07:28:33 +0200 (Thu, 15 Jul 2010)

Log Message:
-----------
* smooth strengths below .5 had no effect

Modified Paths:
--------------
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_templates.c
    branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c

Modified: branches/soc-2010-jwilkins/source/blender/editors/interface/interface_templates.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/interface/interface_templates.c	2010-07-15 03:49:32 UTC (rev 30364)
+++ branches/soc-2010-jwilkins/source/blender/editors/interface/interface_templates.c	2010-07-15 05:28:33 UTC (rev 30365)
@@ -413,9 +413,8 @@
 		
 		
 		uiLayoutRow(layout, 1);
-	} else 
-		
-	if(flag & UI_ID_BROWSE) {
+	} 
+	else if(flag & UI_ID_BROWSE) {
 		but= uiDefBlockButN(block, id_search_menu, MEM_dupallocN(template), "", 0, 0, UI_UNIT_X*1.6, UI_UNIT_Y, "Browse ID data");
 		if(type) {
 			but->icon= RNA_struct_ui_icon(type);

Modified: branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-07-15 03:49:32 UTC (rev 30364)
+++ branches/soc-2010-jwilkins/source/blender/editors/sculpt_paint/sculpt.c	2010-07-15 05:28:33 UTC (rev 30365)
@@ -1169,7 +1169,7 @@
 	count = (int)(bstrength*max_iterations);
 	last  = max_iterations*(bstrength - count*fract);
 
-	for(iteration = 1; iteration <= count; ++iteration) {
+	for(iteration = 0; iteration <= count; ++iteration) {
 		#pragma omp parallel for schedule(guided) if (sd->flags & SCULPT_USE_OPENMP)
 		for(n=0; n<totnode; n++) {
 			if(ss->multires) {