[Bf-blender-cvs] [60f4cb24da7] master: Fix vertex paint alpha brush setting color black

[Campbell Barton]

Commit: 60f4cb24da7462766ea73318f1ff446d803f6319
Author: Campbell Barton
Date:   Sat Apr 28 14:47:53 2018 +0200
Branches: master
https://developer.blender.org/rB60f4cb24da7462766ea73318f1ff446d803f6319

Fix vertex paint alpha brush setting color black

===================================================================

M	source/blender/editors/sculpt_paint/paint_vertex_color_utils.c

===================================================================

diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c b/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c
index 0cdb1e2f57e..a0bd5ea2a2d 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c
@@ -577,7 +577,7 @@ BLI_INLINE uint mcol_alpha_add(uint col_src, int fac)
 {
 	uchar *cp_src, *cp_mix;
 	int temp;
-	uint col_mix = 0;
+	uint col_mix = col_src;
 
 	if (fac == 0) {
 		return col_src;
@@ -596,7 +596,7 @@ BLI_INLINE uint mcol_alpha_sub(uint col_src, int fac)
 {
 	uchar *cp_src, *cp_mix;
 	int temp;
-	uint col_mix = 0;
+	uint col_mix = col_src;
 
 	if (fac == 0) {
 		return col_src;