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

Antonio Vazquez noreply at git.blender.org
Fri Feb 28 22:55:23 CET 2020


Commit: b77051b5fc5a417c444a583c9cb0dd0b95e4c1f7
Author: Antonio Vazquez
Date:   Fri Feb 28 22:49:53 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb77051b5fc5a417c444a583c9cb0dd0b95e4c1f7

Merge branch 'master' into greasepencil-object

 Conflicts:
	source/blender/makesdna/DNA_brush_types.h

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



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

diff --cc source/blender/makesdna/DNA_brush_types.h
index 5768337ea68,e14732ee77a..6aaafc51718
--- a/source/blender/makesdna/DNA_brush_types.h
+++ b/source/blender/makesdna/DNA_brush_types.h
@@@ -271,38 -210,21 +271,53 @@@ typedef enum eBrushElasticDeformType 
    BRUSH_ELASTIC_DEFORM_TWIST = 4,
  } eBrushElasticDeformType;
  
+ typedef enum eBrushClothDeformType {
+   BRUSH_CLOTH_DEFORM_DRAG = 0,
+   BRUSH_CLOTH_DEFORM_PUSH = 1,
+   BRUSH_CLOTH_DEFORM_GRAB = 2,
+   BRUSH_CLOTH_DEFORM_PINCH_POINT = 3,
+   BRUSH_CLOTH_DEFORM_PINCH_PERPENDICULAR = 4,
+   BRUSH_CLOTH_DEFORM_INFLATE = 5,
+   BRUSH_CLOTH_DEFORM_EXPAND = 6,
+ } eBrushClothDeformType;
+ 
+ typedef enum eBrushClothForceFalloffType {
+   BRUSH_CLOTH_FORCE_FALLOFF_RADIAL = 0,
+   BRUSH_CLOTH_FORCE_FALLOFF_PLANE = 1,
+ } eBrushClothForceFalloffType;
+ 
 +/* Gpencilsettings.Vertex_mode */
 +typedef enum eGp_Vertex_Mode {
 +  /* Affect to Stroke only. */
 +  GPPAINT_MODE_STROKE = 0,
 +  /* Affect to Fill only. */
 +  GPPAINT_MODE_FILL = 1,
 +  /* Affect to both. */
 +  GPPAINT_MODE_BOTH = 2,
 +} eGp_Vertex_Mode;
 +
 +/* sculpt_flag */
 +typedef enum eGP_Sculpt_Flag {
 +  /* invert the effect of the brush */
 +  GP_SCULPT_FLAG_INVERT = (1 << 0),
 +  /* smooth brush affects pressure values as well */
 +  GP_SCULPT_FLAG_SMOOTH_PRESSURE = (1 << 2),
 +  /* temporary invert action */
 +  GP_SCULPT_FLAG_TMP_INVERT = (1 << 3),
 +} eGP_Sculpt_Flag;
 +
 +/* sculpt_mode_flag */
 +typedef enum eGP_Sculpt_Mode_Flag {
 +  /* apply brush to position */
 +  GP_SCULPT_FLAGMODE_APPLY_POSITION = (1 << 0),
 +  /* apply brush to strength */
 +  GP_SCULPT_FLAGMODE_APPLY_STRENGTH = (1 << 1),
 +  /* apply brush to thickness */
 +  GP_SCULPT_FLAGMODE_APPLY_THICKNESS = (1 << 2),
 +  /* apply brush to uv data */
 +  GP_SCULPT_FLAGMODE_APPLY_UV = (1 << 3),
 +} eGP_Sculpt_Mode_Flag;
 +
  typedef enum eAutomasking_flag {
    BRUSH_AUTOMASKING_TOPOLOGY = (1 << 0),
  } eAutomasking_flag;



More information about the Bf-blender-cvs mailing list