[Bf-blender-cvs] [ed185c1ec59] temp-gpencil-interpolate: Merge branch 'master' into temp-gpencil-interpolate

[Antonio Vazquez]

Commit: ed185c1ec593b695256f875a93efa0147eac9016
Author: Antonio Vazquez
Date:   Tue Feb 16 12:57:25 2021 +0100
Branches: temp-gpencil-interpolate
https://developer.blender.org/rBed185c1ec593b695256f875a93efa0147eac9016

Merge branch 'master' into temp-gpencil-interpolate

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



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

diff --cc source/blender/makesdna/DNA_scene_types.h
index 90957d799aa,2362686cfce..4605ea26740
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -1142,11 -1158,9 +1142,11 @@@ typedef enum eGP_Interpolate_SettingsFl
    GP_TOOLFLAG_INTERPOLATE_ALL_LAYERS = (1 << 0),
    /* apply interpolation to only selected */
    GP_TOOLFLAG_INTERPOLATE_ONLY_SELECTED = (1 << 1),
 +  /* flip strokes */
 +  GP_TOOLFLAG_INTERPOLATE_FLIP = (1 << 2),
  } eGP_Interpolate_SettingsFlag;
  
- /* GP_Interpolate_Settings.type */
+ /** #GP_Interpolate_Settings.type */
  typedef enum eGP_Interpolate_Type {
    /* Traditional Linear Interpolation */
    GP_IPO_LINEAR = 0,