[Bf-blender-cvs] [bdd605b17d6] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: bdd605b17d6b8df292568daa706b1fa8d9d41228
Author: Antonio Vazquez
Date:   Fri Jan 24 19:13:37 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBbdd605b17d6b8df292568daa706b1fa8d9d41228

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/makesdna/DNA_brush_types.h

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



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

diff --cc source/blender/makesdna/DNA_brush_types.h
index 9332afbbe40,e711fd13822..1aa576ca7a1
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@@ -648,37 -536,20 +648,36 @@@ typedef enum eBrushUVSculptTool 
  #define SCULPT_TOOL_HAS_RAKE(t) ELEM(t, SCULPT_TOOL_SNAKE_HOOK)
  
  #define SCULPT_TOOL_HAS_DYNTOPO(t) \
-   (ELEM( \
-        t, /* These brushes, as currently coded, cannot support dynamic topology */ \
-        SCULPT_TOOL_GRAB, \
-        SCULPT_TOOL_ROTATE, \
-        SCULPT_TOOL_THUMB, \
-        SCULPT_TOOL_LAYER, \
-        SCULPT_TOOL_DRAW_SHARP, \
-        SCULPT_TOOL_TOPOLOGY, \
-        SCULPT_TOOL_ELASTIC_DEFORM, \
-        SCULPT_TOOL_POSE, \
+   (ELEM(t, /* These brushes, as currently coded, cannot support dynamic topology */ \
+         SCULPT_TOOL_GRAB, \
+         SCULPT_TOOL_ROTATE, \
+         SCULPT_TOOL_THUMB, \
+         SCULPT_TOOL_LAYER, \
+         SCULPT_TOOL_DRAW_SHARP, \
+         SCULPT_TOOL_SLIDE_RELAX, \
+         SCULPT_TOOL_ELASTIC_DEFORM, \
+         SCULPT_TOOL_POSE, \
  \
 -        /* These brushes could handle dynamic topology, \ \
 -         * but user feedback indicates it's better not to */ \
 -        SCULPT_TOOL_SMOOTH, \
 -        SCULPT_TOOL_MASK) == 0)
 +       /* These brushes could handle dynamic topology, \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
 +        * \ \
 +        * \ \ \
 +        * \ \ \ \
 +        * \ \ \ \ \
 +        * \ \ \ \ \ \
 +        * \ \ \ \ \ \ \
 +        * \ \ \ \ \ \ \ \
 +        * \ \ \ \ \ \ \ \ \
 +        * \ \ \ \ \ \ \ \ \ \
 +        * \ \ \ \ \ \ \ \ \ \ \
 +        * \ \ \ \ \ \ \ \ \ \ \ \
 +        * \ \ \ \ \ \ \ \ \ \ \ \ \
 +        * \ \ \ \ \ \ \ \ \ \ \ \ \ \
 +        * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
 +        * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
 +        * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
 +        * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ but user feedback indicates it's better not to */ \
 +       SCULPT_TOOL_SMOOTH, \
 +       SCULPT_TOOL_MASK) == 0)
  
  #define SCULPT_TOOL_HAS_TOPOLOGY_RAKE(t) \
    (ELEM(t, /* These brushes, as currently coded, cannot support topology rake. */ \