[Bf-blender-cvs] [ccaca71] soc-2016-pbvh-painting: Fixed pen sensitivity bug.

[Nathan Vollmer]

Commit: ccaca716aef7243b70e4bae7d47725fb7b12539e
Author: Nathan Vollmer
Date:   Tue Sep 13 00:04:49 2016 -0600
Branches: soc-2016-pbvh-painting
https://developer.blender.org/rBccaca716aef7243b70e4bae7d47725fb7b12539e

Fixed pen sensitivity bug.

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

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/editors/sculpt_paint/paint_vertex.c

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index dc16605..ee35b90 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit dc166057192ea882b5cc70484d4c8bacd7cb41b4
+Subproject commit ee35b906abbd72c1a36e61027b15e9af970f5f2b
diff --git a/release/scripts/addons b/release/scripts/addons
index 06dad53..d5d095f 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 06dad53c80801e0e0919f086040e3d9c31bbd0a1
+Subproject commit d5d095f2bc3ea279b3a52003d2496d9d52a754d9
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 7c2e2cd..c2ce7be 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -3324,8 +3324,8 @@ static void do_vpaint_brush_draw_task_cb_ex(
           }
 
           //Mix the new color with the original based on the brush strength and the curve.
-          lcol[loopIndex] = vpaint_blend(data->vp, lcol[loopIndex], ss->previousColor[loopIndex], actualColor,
-                                         255 * fade * bstrength * dot * alpha, brush_alpha_pressure * 255);
+	  lcol[loopIndex] = vpaint_blend(data->vp, lcol[loopIndex], ss->previousColor[loopIndex], actualColor,
+			  255 * fade * bstrength * dot * alpha * brush_alpha_pressure, 255.0*bstrength);
         }
     }
     BKE_pbvh_vertex_iter_end;