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

[Antonio Vazquez]

Commit: f0839ba3dbb673ad62775abb9cc799198f1f10fc
Author: Antonio Vazquez
Date:   Mon Sep 9 15:50:23 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rBf0839ba3dbb673ad62775abb9cc799198f1f10fc

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/makesdna/DNA_brush_types.h
index d53a64b6518,c5d741fd25a..fe9133b24c8
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@@ -487,8 -499,10 +501,10 @@@ typedef enum eBrushUVSculptTool 
          SCULPT_TOOL_ROTATE, \
          SCULPT_TOOL_THUMB, \
          SCULPT_TOOL_LAYER, \
+         SCULPT_TOOL_DRAW_SHARP, \
+         SCULPT_TOOL_ELASTIC_DEFORM, \
  \
 -        /* 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)