[Bf-blender-cvs] [e6157242214] blender2.8: Fix compilation error after recent merge

[Sergey Sharybin]

Commit: e61572422144a2fd1047f83c44b86e2102e783e3
Author: Sergey Sharybin
Date:   Mon Sep 25 19:02:30 2017 +0500
Branches: blender2.8
https://developer.blender.org/rBe61572422144a2fd1047f83c44b86e2102e783e3

Fix compilation error after recent merge

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

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 13467c09548..b3ff8a50dc6 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1681,6 +1681,8 @@ 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) */