[Bf-blender-cvs] [3bbe01dad33] master: Fix T70299: Grab brush not working as expected when Ctrl is press

[Pablo Dobarro]

Commit: 3bbe01dad33c6a57c162c285b4097d689aa389a2
Author: Pablo Dobarro
Date:   Mon Sep 30 15:43:34 2019 +0200
Branches: master
https://developer.blender.org/rB3bbe01dad33c6a57c162c285b4097d689aa389a2

Fix T70299: Grab brush not working as expected when Ctrl is press

Reviewed By: brecht

Maniphest Tasks: T70299

Differential Revision: https://developer.blender.org/D5920

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

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

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

diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index bf10ebe67d1..58e4b67ad42 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -2089,7 +2089,8 @@ static void update_sculpt_normal(Sculpt *sd, Object *ob, PBVHNode **nodes, int t
   StrokeCache *cache = ob->sculpt->cache;
 
   if (cache->mirror_symmetry_pass == 0 && cache->radial_symmetry_pass == 0 &&
-      (cache->first_time || !(brush->flag & BRUSH_ORIGINAL_NORMAL))) {
+      (cache->first_time || !(brush->flag & BRUSH_ORIGINAL_NORMAL)) &&
+      (cache->first_time || !(brush->sculpt_tool & SCULPT_TOOL_GRAB))) {
     calc_sculpt_normal(sd, ob, nodes, totnode, cache->sculpt_normal);
     if (brush->falloff_shape == PAINT_FALLOFF_SHAPE_TUBE) {
       project_plane_v3_v3v3(cache->sculpt_normal, cache->sculpt_normal, cache->view_normal);