[Bf-blender-cvs] [5be901f3445] sculpt-mode-features: Merge branch 'master' into sculpt-mode-features

[Pablo Dobarro]

Commit: 5be901f344573182adb0c953a238b669b8e945eb
Author: Pablo Dobarro
Date:   Mon May 6 18:19:53 2019 +0200
Branches: sculpt-mode-features
https://developer.blender.org/rB5be901f344573182adb0c953a238b669b8e945eb

Merge branch 'master' into sculpt-mode-features

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



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

diff --cc release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 2f48a90b89b,6423c7eb6cd..7f85bc4b50a
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@@ -1821,7 -1849,8 +1867,9 @@@ class VIEW3D_PT_tools_active(ToolSelect
              None,
              _defs_sculpt.hide_border,
              _defs_sculpt.mask_border,
 -            None,
 +            _defs_sculpt.mesh_filter,
+             *_tools_annotate,
++            None,
          ],
          'PAINT_TEXTURE': [
              _defs_texture_paint.generate_from_brushes,
diff --cc source/blender/blenkernel/BKE_pbvh.h
index ce9fda460d3,9b15462de6b..cddf2efda71
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@@ -49,13 -49,21 +50,28 @@@ typedef struct 
    float (*co)[3];
  } PBVHProxyNode;
  
 +typedef struct {
 +  float normal[3];
 +  float nearest_vertex_co[3];
 +  MVert *active_vertex_mesh;
 +  int active_vertex_mesh_index;
 +} RaycastOutputData;
 +
+ typedef enum {
+   PBVH_Leaf = 1,
+ 
+   PBVH_UpdateNormals = 2,
+   PBVH_UpdateBB = 4,
+   PBVH_UpdateOriginalBB = 8,
+   PBVH_UpdateDrawBuffers = 16,
+   PBVH_UpdateRedraw = 32,
+ 
+   PBVH_RebuildDrawBuffers = 64,
+   PBVH_FullyHidden = 128,
+ 
+   PBVH_UpdateTopology = 256,
+ } PBVHNodeFlags;
+ 
  /* Callbacks */
  
  /* returns 1 if the search should continue from this node, 0 otherwise */
diff --cc source/blender/editors/object/CMakeLists.txt
index d4d0ddd9d8d,eaef9313431..48c8c8cee08
--- a/source/blender/editors/object/CMakeLists.txt
+++ b/source/blender/editors/object/CMakeLists.txt
@@@ -28,14 -29,12 +29,13 @@@ set(IN
    ../../makesdna
    ../../makesrna
    ../../modifiers
-   ../../gpencil_modifiers
-   ../../shader_fx
    ../../python
+   ../../shader_fx
    ../../render/extern/include
    ../../windowmanager
 -  ../../../../intern/glew-mx
 +  ../sculpt_paint
    ../../../../intern/guardedalloc
 +  ../../../../intern/glew-mx
  )
  
  set(INC_SYS
diff --cc source/blender/editors/sculpt_paint/paint_cursor.c
index 4a71180e7d8,65e24cecf82..29d73b1c61d
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@@ -842,16 -833,16 +842,16 @@@ static bool paint_draw_alpha_overlay(Un
    x -= vc->ar->winrct.xmin;
    y -= vc->ar->winrct.ymin;
  
-   /* coloured overlay should be drawn separately */
+   /* Colored overlay should be drawn separately. */
    if (col) {
      if (!(flags & PAINT_OVERLAY_OVERRIDE_PRIMARY)) {
 -      paint_draw_tex_overlay(ups, brush, vc, x, y, zoom, true, true);
 +      alpha_active = paint_draw_tex_overlay(ups, brush, vc, x, y, zoom, true, true);
      }
      if (!(flags & PAINT_OVERLAY_OVERRIDE_SECONDARY)) {
 -      paint_draw_tex_overlay(ups, brush, vc, x, y, zoom, false, false);
 +      alpha_active = paint_draw_tex_overlay(ups, brush, vc, x, y, zoom, false, false);
      }
      if (!(flags & PAINT_OVERLAY_OVERRIDE_CURSOR)) {
 -      paint_draw_cursor_overlay(ups, brush, vc, x, y, zoom);
 +      alpha_active = paint_draw_cursor_overlay(ups, brush, vc, x, y, zoom);
      }
    }
    else {
diff --cc source/blender/makesdna/DNA_brush_types.h
index 75423cd9ee7,6f775e48d58..64c5e1ad477
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@@ -297,7 -275,7 +299,8 @@@ typedef struct Brush 
    char mask_tool;
    /** Active grease pencil tool. */
    char gpencil_tool;
-   char _pad0[6];
 -  char _pad0[1];
++
++  char _pad0[5];
  
    float autosmooth_factor;
  
@@@ -470,10 -437,15 +473,17 @@@ typedef enum eBrushSculptTool 
    SCULPT_TOOL_BLOB = 17,
    SCULPT_TOOL_CLAY_STRIPS = 18,
    SCULPT_TOOL_MASK = 19,
 +  SCULPT_TOOL_DAM = 20,
 +  SCULPT_TOOL_PAINT = 21,
  } eBrushSculptTool;
  
+ /* Brush.uv_sculpt_tool */
+ typedef enum eBrushUVSculptTool {
+   UV_SCULPT_TOOL_GRAB = 0,
+   UV_SCULPT_TOOL_RELAX = 1,
+   UV_SCULPT_TOOL_PINCH = 2,
+ } eBrushUVSculptTool;
+ 
  /** When #BRUSH_ACCUMULATE is used */
  #define SCULPT_TOOL_HAS_ACCUMULATE(t) \
    ELEM(t, \