[Bf-blender-cvs] [a28f40109cc] greasepencil-object: Merge branch 'master' into patch/gpencil-update-on-write

[Falk David]

Commit: a28f40109ccf73d2d785fe9f044ca5231763f2f5
Author: Falk David
Date:   Wed Feb 2 12:42:35 2022 +0100
Branches: greasepencil-object
https://developer.blender.org/rBa28f40109ccf73d2d785fe9f044ca5231763f2f5

Merge branch 'master' into patch/gpencil-update-on-write

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



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

diff --cc source/blender/makesdna/DNA_userdef_types.h
index 2055a70781d,637dd216935..bfb16346b69
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@@ -667,6 -665,7 +666,7 @@@ typedef struct UserDef_Experimental 
    char use_sculpt_tools_tilt;
    char use_extended_asset_browser;
    char use_override_templates;
 -  char _pad[2];
++  char _pad[1];
    /** `makesdna` does not allow empty structs. */
  } UserDef_Experimental;