[Bf-blender-cvs] [8dfc08d14e4] greasepencil-object: Fix merge errors

[Antonio Vazquez]

Commit: 8dfc08d14e40720366d321eb7695096d9a3d6269
Author: Antonio Vazquez
Date:   Fri Dec 15 13:17:20 2017 +0100
Branches: greasepencil-object
https://developer.blender.org/rB8dfc08d14e40720366d321eb7695096d9a3d6269

Fix merge  errors

There was a problem with struct byte alignment.

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

M	source/blender/makesdna/DNA_scene_types.h

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

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index b28beb8c91d..cb6aec3a3f6 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1687,8 +1687,8 @@ typedef struct Scene {
 	/* Units */
 	struct UnitSettings unit;
 	
-	/* Movie Tracking */
-	struct MovieClip *clip;			/* active movie clip */
+	/* Grease Pencil */
+	struct bGPdata *gpd;
 
 	/* Movie Tracking */
 	struct MovieClip *clip;			/* active movie clip */
@@ -1699,10 +1699,8 @@ typedef struct Scene {
 	uint64_t customdata_mask;	/* XXX. runtime flag for drawing, actually belongs in the window, only used by BKE_object_handle_update() */
 	uint64_t customdata_mask_modal; /* XXX. same as above but for temp operator use (gl renders) */
 	
-	/* Grease Pencil */
-	struct bGPdata *gpd;
 	struct Object *gp_object;     /* default GP object for annotations */
-	
+
 	/* Color Management */
 	ColorManagedViewSettings view_settings;
 	ColorManagedDisplaySettings display_settings;