[Bf-blender-cvs] [0e478f2acc7] soc-2020-greasepencil-curve: Merge branch 'greasepencil-edit-curve' into soc-2020-greasepencil-curve

[Falk David]

Commit: 0e478f2acc780df98b64cffd155ae7ae56c3d54a
Author: Falk David
Date:   Mon Jul 27 00:23:56 2020 +0200
Branches: soc-2020-greasepencil-curve
https://developer.blender.org/rB0e478f2acc780df98b64cffd155ae7ae56c3d54a

Merge branch 'greasepencil-edit-curve' into soc-2020-greasepencil-curve

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



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

diff --cc source/blender/blenkernel/intern/gpencil.c
index 36e20d256ac,992efe4bdb5..e66e85ef1a7
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@@ -536,7 -536,7 +536,6 @@@ bGPdata *BKE_gpencil_data_addnew(Main *
    gpd->flag |= GP_DATA_VIEWALIGN;
    /* always enable object onion skin switch */
    gpd->flag |= GP_DATA_SHOW_ONIONSKINS;
-   
 -
    /* GP object specific settings */
    ARRAY_SET_ITEMS(gpd->line_color, 0.6f, 0.6f, 0.6f, 0.5f);