[Bf-blender-cvs] [628ac1472fd] greasepencil-edit-curve: Merge branch 'master' into greasepencil-edit-curve

[Antonio Vazquez]

Commit: 628ac1472fdc779a94ee1e9285760fb113833f01
Author: Antonio Vazquez
Date:   Wed Oct 21 19:40:40 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB628ac1472fdc779a94ee1e9285760fb113833f01

Merge branch 'master' into greasepencil-edit-curve

 Conflicts:
	source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index 85bcde2b7aa,00085cb7d59..8737e8571e3
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -883,34 -883,9 +883,23 @@@ void blo_do_versions_290(FileData *fd, 
          part->phystype = PART_PHYS_NO;
        }
      }
 +    /* 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;
 +      }
 +    }
    }
  
-   /**
-    * Versioning code until next subversion bump goes here.
-    *
-    * \note Be sure to check when bumping the version:
-    * - "versioning_userdef.c", #blo_do_versions_userdef
-    * - "versioning_userdef.c", #do_versions_theme
-    *
-    * \note Keep this message at the bottom of the function.
-    */
-   {
-     /* Keep this block, even when empty. */
- 
+   if (!MAIN_VERSION_ATLEAST(bmain, 291, 9)) {
      /* Remove options of legacy UV/Image editor */
      for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
        LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
diff --cc source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
index aad93e1b48d,8f17be97710..c91bb1cef92
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
@@@ -101,7 -100,12 +101,12 @@@ static void deformStroke(GpencilModifie
      return;
    }
  
 -  BKE_gpencil_stroke_subdivide(gps, mmd->level, mmd->type);
 +  BKE_gpencil_stroke_subdivide(gpd, gps, mmd->level, mmd->type);
+ 
+   /* If the stroke is cyclic, must generate the closing geometry. */
+   if (gps->flag & GP_STROKE_CYCLIC) {
+     BKE_gpencil_stroke_close(gps);
+   }
  }
  
  static void bakeModifier(struct Main *UNUSED(bmain),