diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-01-22 17:41:50 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2020-01-22 17:41:50 +0300 |
| commit | cfb7a8048c5d9a5b7c1e15a2681ded342d34f253 (patch) | |
| tree | 10446fe098dfc7b5709fa58f94a986e3052737cc /source/blender/makesdna | |
| parent | 6a49161c8c60cb63d9e3ed8dbe700163ff858436 (diff) | |
| parent | cbbbb9d17918af656578bc6526d21e41acaa59e4 (diff) | |
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_gpencil_types.h | 1 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 33dfe66a151..1c2008749b6 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -181,6 +181,7 @@ typedef struct bGPDstroke_Runtime { /** Original stroke (used to dereference evaluated data) */ struct bGPDstroke *gps_orig; + void *_pad2; } bGPDstroke_Runtime; /* Grease-Pencil Annotations - 'Stroke' diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 7cfd19b4bd9..a645a03d1ac 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1793,6 +1793,7 @@ typedef struct Scene { /** Settings to be override by workspaces. */ IDProperty *layer_properties; + void *_pad9; struct SceneDisplay display; struct SceneEEVEE eevee; |