[Bf-blender-cvs] [61289c36291] greasepencil-edit-curve: Merge branch 'master' into greasepencil-edit-curve

[Antonio Vazquez]

Commit: 61289c36291199525037e424cf84d5a65629bf58
Author: Antonio Vazquez
Date:   Sat Sep 5 15:13:10 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB61289c36291199525037e424cf84d5a65629bf58

Merge branch 'master' into greasepencil-edit-curve

 Conflicts:
	source/blender/blenkernel/BKE_gpencil_geom.h

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



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

diff --cc source/blender/blenkernel/BKE_gpencil_geom.h
index 8a715bb50c4,3baa650c8f0..70e12eee6dc
--- a/source/blender/blenkernel/BKE_gpencil_geom.h
+++ b/source/blender/blenkernel/BKE_gpencil_geom.h
@@@ -51,17 -51,11 +51,17 @@@ void BKE_gpencil_stroke_boundingbox_cal
  
  /* stroke geometry utilities */
  void BKE_gpencil_stroke_normal(const struct bGPDstroke *gps, float r_normal[3]);
 -void BKE_gpencil_stroke_simplify_adaptive(struct bGPDstroke *gps, float epsilon);
 -void BKE_gpencil_stroke_simplify_fixed(struct bGPDstroke *gps);
 -void BKE_gpencil_stroke_subdivide(struct bGPDstroke *gps, int level, int type);
 -bool BKE_gpencil_stroke_trim(struct bGPDstroke *gps);
 -void BKE_gpencil_stroke_merge_distance(struct bGPDframe *gpf,
 +void BKE_gpencil_stroke_simplify_adaptive(struct bGPdata *gpd,
 +                                          struct bGPDstroke *gps,
-                                           float factor);
++                                          float epsilon);
 +void BKE_gpencil_stroke_simplify_fixed(struct bGPdata *gpd, struct bGPDstroke *gps);
 +void BKE_gpencil_stroke_subdivide(struct bGPdata *gpd,
 +                                  struct bGPDstroke *gps,
 +                                  int level,
 +                                  int type);
 +bool BKE_gpencil_stroke_trim(struct bGPdata *gpd, struct bGPDstroke *gps);
 +void BKE_gpencil_stroke_merge_distance(struct bGPdata *gpd,
 +                                       struct bGPDframe *gpf,
                                         struct bGPDstroke *gps,
                                         const float threshold,
                                         const bool use_unselected);
diff --cc source/blender/blenloader/intern/versioning_290.c
index 4cdb1261c3d,b970f18933f..66dc75e0fdf
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -546,21 -546,14 +546,29 @@@ void blo_do_versions_290(FileData *fd, 
     * \note Keep this message at the bottom of the function.
     */
    {
+     /* Set the minimum sequence interpolate for grease pencil. */
+     if (!DNA_struct_elem_find(fd->filesdna, "GP_Interpolate_Settings", "int", "step")) {
+       LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
+         ToolSettings *ts = scene->toolsettings;
+         ts->gp_interpolate.step = 1;
+       }
+     }
+ 
      /* Keep this block, even when empty. */
 +
 +    /* Init grease pencil default curve resolution. */
 +    if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "int", "curve_edit_resolution")) {
 +      LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) {
 +        gpd->curve_edit_resolution = GP_DEFAULT_CURVE_RESOLUTION;
 +        gpd->flag |= GP_DATA_CURVE_ADAPTIVE_RESOLUTION;
 +      }
 +    }
 +    /* Init grease pencil curve editing error threshold. */
 +    if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "float", "curve_edit_threshold")) {
 +      LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) {
 +        gpd->curve_edit_threshold = GP_DEFAULT_CURVE_ERROR;
 +        gpd->curve_edit_corner_angle = GP_DEFAULT_CURVE_EDIT_CORNER_ANGLE;
 +      }
 +    }
    }
  }