Commit: e09dfe644ba10ecbb330dbb5ed8c1f1a3bfca251
Author: Yiming Wu
Date: Wed Jun 12 21:35:05 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBe09dfe644ba10ecbb330dbb5ed8c1f1a3bfca251
Merge remote-tracking branch 'origin/master' into soc-2019-npr
# Conflicts:
# release/datafiles/locale
# release/scripts/addons
# release/scripts/addons_contrib
===================================================================
===================================================================
diff --cc source/blender/makesdna/DNA_gpencil_types.h
index d5ab6e0412a,307a6f2fe16..dbcacbcdcfe
--- a/source/blender/makesdna/DNA_gpencil_types.h
+++ b/source/blender/makesdna/DNA_gpencil_types.h
@@@ -467,8 -465,9 +467,8 @@@ typedef struct bGPdata
/* Grease-Pencil data */
/** BGPDlayers. */
ListBase layers;
- /** Settings for this datablock. */
+ /** Settings for this data-block. */
int flag;
-
char _pad1[4];
/* Palettes */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
