[Bf-blender-cvs] [84516c806ba] sculpt-mode-features: Merge branch 'master' into sculpt-mode-features

[Pablo Dobarro]

Commit: 84516c806bae5f3fb82f6ccc1123bd1428298c2e
Author: Pablo Dobarro
Date:   Thu Jul 25 14:25:22 2019 +0200
Branches: sculpt-mode-features
https://developer.blender.org/rB84516c806bae5f3fb82f6ccc1123bd1428298c2e

Merge branch 'master' into sculpt-mode-features

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index d971e4543f7,cb2b64957f0..f21d3692cc5
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -3515,12 -3531,9 +3537,16 @@@ void blo_do_versions_280(FileData *fd, 
      LISTBASE_FOREACH (bArmature *, arm, &bmain->armatures) {
        arm->flag &= ~(ARM_FLAG_UNUSED_6);
      }
 +
 +    Brush *br;
 +    for (br = bmain->brushes.first; br; br = br->id.next) {
 +      if (br->ob_mode & OB_MODE_SCULPT) {
 +        br->normal_radius_factor = 0.2f;
 +      }
 +    }
    }
+ 
+   {
+     /* Versioning code until next subversion bump goes here. */
+   }
  }
diff --cc source/blender/editors/sculpt_paint/paint_vertex.c
index 7fd31ec7841,980b043bf8b..7b50f35070d
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@@ -1,4 -1,4 +1,4 @@@
--/*
++    /*
   * This program is free software; you can redistribute it and/or
   * modify it under the terms of the GNU General Public License
   * as published by the Free Software Foundation; either version 2
@@@ -2322,8 -2350,7 +2351,8 @@@ static void wpaint_stroke_update_step(b
  
    /* calculate pivot for rotation around seletion if needed */
    /* also needed for "View Selected" on last stroke */
 +  ED_view3d_autodist_init(depsgraph, vc->ar, vc->v3d, 0);
-   paint_last_stroke_update(scene, vc->ar, mval);
+   paint_last_stroke_update(scene, vc->ar, ss->cache->mouse);
  
    BKE_mesh_batch_cache_dirty_tag(ob->data, BKE_MESH_BATCH_DIRTY_ALL);
  
@@@ -3303,8 -3329,7 +3332,8 @@@ static void vpaint_stroke_update_step(b
  
    /* calculate pivot for rotation around seletion if needed */
    /* also needed for "View Selected" on last stroke */
 +  ED_view3d_autodist_init(depsgraph, vc->ar, vc->v3d, 0);
-   paint_last_stroke_update(scene, vc->ar, mval);
+   paint_last_stroke_update(scene, vc->ar, ss->cache->mouse);
  
    ED_region_tag_redraw(vc->ar);