[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41546] branches/soc-2011-carrot/source/ blender: Dynamic Paint:

[Miika Hamalainen]

Revision: 41546
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41546
Author:   miikah
Date:     2011-11-05 07:39:59 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
Dynamic Paint:
* Fixed another issue from latest alpha blending changes. Zero alpha brush was painting black color.
* Fix: "Inner Proximity" brush setting was also affecting displace.
* Other small code changes.

Modified Paths:
--------------
    branches/soc-2011-carrot/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_dynamicpaint.c

Modified: branches/soc-2011-carrot/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- branches/soc-2011-carrot/source/blender/blenkernel/intern/dynamicpaint.c	2011-11-05 05:44:52 UTC (rev 41545)
+++ branches/soc-2011-carrot/source/blender/blenkernel/intern/dynamicpaint.c	2011-11-05 07:39:59 UTC (rev 41546)
@@ -3401,7 +3401,7 @@
 
 
 					/* if any sample was inside paint range	*/
-					if (brushStrength > 0.01f) {
+					if (brushStrength > 0.0f || depth > 0.0f) {
 
 						/* apply supersampling results	*/
 						if (samples > 1) {
@@ -4390,8 +4390,10 @@
 				pPoint->alpha = (f_color[3] - pPoint->e_alpha)/(1.0f-pPoint->e_alpha);
 				/* for each rgb component, calculate a new dry layer color that keeps the final blend color
 				*  with these new alpha values. (wet layer color doesnt change)*/
-				for (i=0; i<3; i++) {
-					pPoint->color[i] = (f_color[i]*f_color[3] - pPoint->e_color[i]*pPoint->e_alpha)/(pPoint->alpha*(1.0f-pPoint->e_alpha));
+				if (pPoint->alpha) {
+					for (i=0; i<3; i++) {
+						pPoint->color[i] = (f_color[i]*f_color[3] - pPoint->e_color[i]*pPoint->e_alpha)/(pPoint->alpha*(1.0f-pPoint->e_alpha));
+					}
 				}
 
 				pPoint->state = DPAINT_PAINT_WET;

Modified: branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c
===================================================================
--- branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c	2011-11-05 05:44:52 UTC (rev 41545)
+++ branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c	2011-11-05 07:39:59 UTC (rev 41546)
@@ -2181,7 +2181,7 @@
 
 		RNA_property_enum_name(C, itemptr, prop, RNA_property_enum_get(itemptr, prop), &enum_name);
 
-		sprintf(name_final, "%s (%s)",name,enum_name);
+		BLI_snprintf(name_final, sizeof(name_final), "%s (%s)",name,enum_name);
 		uiItemL(sub, name_final, icon);
 		if (dynamicPaint_surfaceHasColorPreview(surface)) {
 			uiBlockSetEmboss(block, UI_EMBOSSN);

Modified: branches/soc-2011-carrot/source/blender/makesrna/intern/rna_dynamicpaint.c
===================================================================
--- branches/soc-2011-carrot/source/blender/makesrna/intern/rna_dynamicpaint.c	2011-11-05 05:44:52 UTC (rev 41545)
+++ branches/soc-2011-carrot/source/blender/makesrna/intern/rna_dynamicpaint.c	2011-11-05 07:39:59 UTC (rev 41546)
@@ -749,7 +749,7 @@
 	
 	prop= RNA_def_property(srna, "paint_wetness", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "wetness");
-	RNA_def_property_range(prop, 0.0, 1.5);
+	RNA_def_property_range(prop, 0.0, 1.0);
 	RNA_def_property_ui_range(prop, 0.0, 1.0, 5, 2);
 	RNA_def_property_ui_text(prop, "Paint Wetness", "Paint wetness. Visible in wetmap. Some effects only affect wet paint");
 	RNA_def_property_update(prop, NC_OBJECT|ND_MODIFIER, "rna_DynamicPaint_redoModifier");