Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPablo Dobarro <pablodp606@gmail.com>2019-09-30 16:43:34 +0300
committerPablo Dobarro <pablodp606@gmail.com>2019-10-03 16:34:54 +0300
commit3bbe01dad33c6a57c162c285b4097d689aa389a2 (patch)
treeb51604dad2fe977d3bc47120d31e33565dbc0ca7
parentae7bea265d0ab48f2cb4636b734bc29ee997a311 (diff)
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
-rw-r--r--source/blender/editors/sculpt_paint/sculpt.c3
1 files changed, 2 insertions, 1 deletions
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);