[Bf-blender-cvs] [cbbbb9d1791] blender-v2.82-release: Fix wrong DNA alignment on arm{el, hf} and mipsel

Sergey Sharybin noreply at git.blender.org
Wed Jan 22 15:37:27 CET 2020


Commit: cbbbb9d17918af656578bc6526d21e41acaa59e4
Author: Sergey Sharybin
Date:   Wed Jan 22 15:34:27 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rBcbbbb9d17918af656578bc6526d21e41acaa59e4

Fix wrong DNA alignment on arm{el,hf} and mipsel

Technically, pointers are to be padded with followup pointer.

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

M	source/blender/makesdna/DNA_gpencil_types.h
M	source/blender/makesdna/DNA_scene_types.h

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

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;



More information about the Bf-blender-cvs mailing list