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

[Antonio Vazquez]

Commit: aafb5cee67b74e793f0f1f4b93b2ecc8f85e4b5c
Author: Antonio Vazquez
Date:   Sun Sep 20 15:32:02 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rBaafb5cee67b74e793f0f1f4b93b2ecc8f85e4b5c

Merge branch 'master' into greasepencil-edit-curve

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

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index 577dcdc7c13,3c95a998d90..b0f19427086
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -662,19 -736,28 +736,43 @@@ void blo_do_versions_290(FileData *fd, 
    {
      /* Keep this block, even when empty. */
  
+     /* Darken Inactive Overlay. */
+     if (!DNA_struct_elem_find(fd->filesdna, "View3DOverlay", "float", "fade_alpha")) {
+       for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
+         LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
+           LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
+             if (sl->spacetype == SPACE_VIEW3D) {
+               View3D *v3d = (View3D *)sl;
+               v3d->overlay.fade_alpha = 0.40f;
+               v3d->overlay.flag |= V3D_OVERLAY_FADE_INACTIVE;
+             }
+           }
+         }
+       }
+     }
+ 
+     /* Unify symmetry as a mesh property. */
+     if (!DNA_struct_elem_find(fd->filesdna, "Mesh", "char", "symmetry")) {
+       LISTBASE_FOREACH (Mesh *, mesh, &bmain->meshes) {
+         /* The previous flags used to store mesh symmetry in edit-mode match the new ones that are
+          * used in #Mesh.symmetry. */
+         mesh->symmetry = mesh->editflag & (ME_SYMMETRY_X | ME_SYMMETRY_Y | ME_SYMMETRY_Z);
+       }
+     }
++
 +    /* 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;
 +      }
 +    }
    }
  }