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

[Antonio Vazquez]

Commit: 6b44a6ca7ac84b613b8dd1dc1de56332e4e8ad11
Author: Antonio Vazquez
Date:   Tue Sep 10 19:55:57 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB6b44a6ca7ac84b613b8dd1dc1de56332e4e8ad11

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/makesdna/DNA_brush_types.h
index fe9133b24c8,3aafe5a1ddb..1a345552094
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@@ -503,8 -509,9 +511,9 @@@ typedef enum eBrushUVSculptTool 
          SCULPT_TOOL_LAYER, \
          SCULPT_TOOL_DRAW_SHARP, \
          SCULPT_TOOL_ELASTIC_DEFORM, \
+         SCULPT_TOOL_POSE, \
  \
 -        /* These brushes could handle dynamic topology, \
 +        /* These brushes could handle dynamic topology, \ \ \
           * but user feedback indicates it's better not to */ \
          SCULPT_TOOL_SMOOTH, \
          SCULPT_TOOL_MASK) == 0)