[Bf-blender-cvs] [6387426fff5] greasepencil-edit-curve: Merge branch 'master' into greasepencil-edit-curve

[Antonio Vazquez]

Commit: 6387426fff5cc196fe7f6f76e14323cef6cb9fb4
Author: Antonio Vazquez
Date:   Thu Oct 1 16:23:53 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB6387426fff5cc196fe7f6f76e14323cef6cb9fb4

Merge branch 'master' into greasepencil-edit-curve

 Conflicts:
	source/blender/blenloader/intern/versioning_290.c

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



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

diff --cc source/blender/blenkernel/BKE_gpencil.h
index 8e203446de4,b07946856fd..460966a1840
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@@ -47,9 -48,7 +48,8 @@@ struct bGPDlayer
  struct bGPDlayer_Mask;
  struct bGPDspoint;
  struct bGPDstroke;
 +struct bGPDcurve;
  struct bGPdata;
- struct BlendDataReader;
  
  #define GPENCIL_SIMPLIFY(scene) ((scene->r.simplify_gpencil & SIMPLIFY_GPENCIL_ENABLE))
  #define GPENCIL_SIMPLIFY_ONPLAY(playing) \
diff --cc source/blender/blenloader/intern/versioning_290.c
index b0f19427086,1b9e53ded63..cbf3277f63f
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -760,19 -749,29 +749,43 @@@ void blo_do_versions_290(FileData *fd, 
        }
      }
  
+     /* Alembic importer: allow vertex interpolation by default. */
+     for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
+       LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
+         if (md->type != eModifierType_MeshSequenceCache) {
+           continue;
+         }
+ 
+         MeshSeqCacheModifierData *data = (MeshSeqCacheModifierData *)md;
+         data->read_flag |= MOD_MESHSEQ_INTERPOLATE_VERTICES;
+       }
+     }
+   }
+ 
+   /**
+    * Versioning code until next subversion bump goes here.
+    *
+    * \note Be sure to check when bumping the version:
+    * - "versioning_userdef.c", #BLO_version_defaults_userpref_blend
+    * - "versioning_userdef.c", #do_versions_theme
+    *
+    * \note Keep this message at the bottom of the function.
+    */
+   {
+     /* 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;
 +      }
 +    }
    }
  }