[Bf-blender-cvs] [647c065b9cf] sculpt-dev: Merge branch 'master' into sculpt-dev

[Pablo Dobarro]

Commit: 647c065b9cfb4d7c9ff3241deeba611c9f5ba1b8
Author: Pablo Dobarro
Date:   Fri Mar 12 16:51:18 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rB647c065b9cfb4d7c9ff3241deeba611c9f5ba1b8

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/editors/sculpt_paint/sculpt_intern.h
index aa701a1cb3e,c323a4d744a..56370be9710
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@@ -1343,11 -1254,7 +1343,11 @@@ typedef struct FilterCache 
    float *sharpen_factor;
    float (*detail_directions)[3];
  
 +  /* Sphere mesh filter. */
 +  float sphere_center[3];
 +  float sphere_radius;
 +
-   /* Filter orientaiton. */
+   /* Filter orientation. */
    SculptFilterOrientation orientation;
    float obmat[4][4];
    float obmat_inv[4][4];