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

[Antonio Vazquez]

Commit: 956bb4bf288a528b59c7cc4a062a44e0d4f07d67
Author: Antonio Vazquez
Date:   Thu Oct 8 10:32:02 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB956bb4bf288a528b59c7cc4a062a44e0d4f07d67

Merge branch 'master' into greasepencil-edit-curve

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

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



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

diff --cc source/blender/blenkernel/BKE_gpencil.h
index 460966a1840,7d50599a8f0..6dc8d1ef06e
--- a/source/blender/blenkernel/BKE_gpencil.h
+++ b/source/blender/blenkernel/BKE_gpencil.h
@@@ -114,13 -111,8 +114,11 @@@ struct bGPdata *BKE_gpencil_data_addnew
  struct bGPDframe *BKE_gpencil_frame_duplicate(const struct bGPDframe *gpf_src);
  struct bGPDlayer *BKE_gpencil_layer_duplicate(const struct bGPDlayer *gpl_src);
  void BKE_gpencil_frame_copy_strokes(struct bGPDframe *gpf_src, struct bGPDframe *gpf_dst);
 -struct bGPDstroke *BKE_gpencil_stroke_duplicate(struct bGPDstroke *gps_src, const bool dup_points);
 +struct bGPDcurve *BKE_gpencil_stroke_curve_duplicate(struct bGPDcurve *gpc_src);
 +struct bGPDstroke *BKE_gpencil_stroke_duplicate(struct bGPDstroke *gps_src,
 +                                                const bool dup_points,
 +                                                const bool dup_curve);
  
- struct bGPdata *BKE_gpencil_copy(struct Main *bmain, const struct bGPdata *gpd);
- 
  struct bGPdata *BKE_gpencil_data_duplicate(struct Main *bmain,
                                             const struct bGPdata *gpd,
                                             bool internal_copy);
diff --cc source/blender/blenloader/intern/versioning_290.c
index dc81e650d22,520a5da878c..be5c4fb57ac
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -806,19 -806,19 +806,33 @@@ void blo_do_versions_290(FileData *fd, 
          }
        }
      }
+ 
+     /* UV/Image show overlay option. */
+     if (!DNA_struct_find(fd->filesdna, "SpaceImageOverlay")) {
+       LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
+         LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
+           LISTBASE_FOREACH (SpaceLink *, space, &area->spacedata) {
+             if (space->spacetype == SPACE_IMAGE) {
+               SpaceImage *sima = (SpaceImage *)space;
+               sima->overlay.flag = SI_OVERLAY_SHOW_OVERLAYS;
+             }
+           }
+         }
+       }
+     }
 +    /* 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;
 +      }
 +    }
    }
  }