[Bf-blender-cvs] [eca2d5f405b] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: eca2d5f405b6aa9ab605dc9dca43902814686de4
Author: Antonio Vazquez
Date:   Tue Sep 26 10:57:13 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBeca2d5f405b6aa9ab605dc9dca43902814686de4

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/makesdna/DNA_scene_types.h
index 4537c6221e1,b3ff8a50dc6..5306c529e6b
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -1739,13 -1681,14 +1701,15 @@@ typedef struct Scene 
  	/* Physics simulation settings */
  	struct PhysicsSettings physics_settings;
  
+ 	void *pad6;
+ 
  	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) */
 -
 -	/* Movie Tracking */
 -	struct MovieClip *clip;			/* active movie clip */
 -
 +	
 +	/* Grease Pencil */
 +	struct bGPdata *gpd;
 +	struct Object *gp_object;     /* default GP object for annotations */
 +	
  	/* Color Management */
  	ColorManagedViewSettings view_settings;
  	ColorManagedDisplaySettings display_settings;