diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-25 17:02:30 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-09-25 17:02:30 +0300 |
| commit | e61572422144a2fd1047f83c44b86e2102e783e3 (patch) | |
| tree | d10aa24241d812457fd16efed59538e502f75293 /source/blender/makesdna | |
| parent | 98ba302f7053b9bebc3854d0d05bdcaa55b6afc7 (diff) | |
Fix compilation error after recent merge
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 |
1 files changed, 2 insertions, 0 deletions
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) */ |