[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55259] trunk/blender/source/blender: Fix silly mistake that could lead to crash.

[Antony Riakiotakis]

Revision: 55259
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55259
Author:   psy-fi
Date:     2013-03-14 03:47:20 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
Fix silly mistake that could lead to crash. Also, slight cleanup/rename
and comments

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/brush.c
    trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c

Modified: trunk/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/brush.c	2013-03-14 03:42:17 UTC (rev 55258)
+++ trunk/blender/source/blender/blenkernel/intern/brush.c	2013-03-14 03:47:20 UTC (rev 55259)
@@ -472,7 +472,8 @@
 	return 0;
 }
 
-/* Return a multiplier for brush strength on a particular vertex. */
+/* Generic texture sampler for 3D painting systems. point has to be either in
+ * region space mouse coordinates, or 3d world coordinates for 3D mapping */
 float BKE_brush_sample_tex_3D(const Scene *scene, Brush *br,
                               const float point[3],
                               float rgba[3], const int thread,

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2013-03-14 03:42:17 UTC (rev 55258)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c	2013-03-14 03:47:20 UTC (rev 55259)
@@ -872,7 +872,7 @@
 		if (dist_squared <= brush_size_pressure * brush_size_pressure) {
 			Brush *brush = paint_brush(&vp->paint);
 			const float dist = sqrtf(dist_squared);
-			if (brush->mtex.tex) {
+			if (brush->mtex.tex && rgba) {
 				if (brush->mtex.brush_map_mode == MTEX_MAP_MODE_3D)
 					BKE_brush_sample_tex_3D(vc->scene, brush, co, rgba, 0, NULL);
 				else
@@ -886,7 +886,7 @@
 	return 0.0f;
 }
 
-static float calc_vp_alpha_dl(VPaint *vp, ViewContext *vc,
+static float calc_vp_alpha_col_dl(VPaint *vp, ViewContext *vc,
                               float vpimat[3][3], const DMCoNo *v_co_no,
                               const float mval[2],
                               const float brush_size_pressure, const float brush_alpha_pressure, float rgba[4])
@@ -2385,7 +2385,7 @@
 	{ \
 		unsigned int vidx = v_idx_var; \
 		if (me->dvert[vidx].flag) { \
-			alpha = calc_vp_alpha_dl(wp, vc, wpd->wpimat, &wpd->vertexcosnos[vidx], \
+			alpha = calc_vp_alpha_col_dl(wp, vc, wpd->wpimat, &wpd->vertexcosnos[vidx], \
 			                         mval, brush_size_pressure, brush_alpha_pressure, NULL); \
 			if (alpha) { \
 				do_weight_paint_vertex(wp, ob, &wpi, vidx, alpha, paintweight); \
@@ -2818,7 +2818,7 @@
 	for (i = 0; i < mpoly->totloop; i++, ml++) {
 		float rgba[4];
 		unsigned int paintcol;
-		alpha = calc_vp_alpha_dl(vp, vc, vpd->vpimat,
+		alpha = calc_vp_alpha_col_dl(vp, vc, vpd->vpimat,
 		                         &vpd->vertexcosnos[ml->v], mval,
 		                         brush_size_pressure, brush_alpha_pressure, rgba);