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

[Antonio Vazquez]

Commit: 66aa884b89524cca8b61e09b692dfff6b71bb9ad
Author: Antonio Vazquez
Date:   Mon Sep 14 15:28:04 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB66aa884b89524cca8b61e09b692dfff6b71bb9ad

Merge branch 'master' into greasepencil-edit-curve

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index 3be814a67c1,7805dbdcefa..f447713feb9
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -597,21 -584,20 +584,35 @@@ void blo_do_versions_290(FileData *fd, 
          }
        }
      }
+ 
+     /* Solver and Collections for Boolean. */
+     if (!DNA_struct_elem_find(fd->filesdna, "BooleanModifierData", "char", "solver")) {
+       for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
+         LISTBASE_FOREACH (ModifierData *, md, &object->modifiers) {
+           if (md->type == eModifierType_Boolean) {
+             BooleanModifierData *bmd = (BooleanModifierData *)md;
+             bmd->solver = eBooleanModifierSolver_Fast;
+             bmd->flag = eBooleanModifierFlag_Object;
+           }
+         }
+       }
+     }
+ 
      /* 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;
 +      }
 +    }
    }
  }