diff options
| author | Sergey Sharybin <sergey@blender.org> | 2021-11-16 19:25:48 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey@blender.org> | 2021-11-16 19:25:48 +0300 |
| commit | ba6427adfaec0d405386f14fef5728f0114f7589 (patch) | |
| tree | 303a245fa7e2474febf1a1b4d42bdb89a8ef3e69 /source/blender/makesdna/DNA_userdef_types.h | |
| parent | bee7a56687283cc3642d625357d8d2b1847b67a1 (diff) | |
| parent | b3529ecf0eb5e942267eb168fc078188de193400 (diff) | |
Merge branch 'blender-v3.0-release'
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index aad84482f07..c8fdac19b61 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -652,6 +652,7 @@ typedef struct UserDef_Experimental { char no_proxy_to_override_conversion; char use_cycles_debug; char use_geometry_nodes_legacy; + char show_asset_debug_info; char SANITIZE_AFTER_HERE; /* The following options are automatically sanitized (set to 0) * when the release cycle is not alpha. */ @@ -662,7 +663,7 @@ typedef struct UserDef_Experimental { char use_sculpt_tools_tilt; char use_extended_asset_browser; char use_override_templates; - char _pad[3]; + char _pad[2]; /** `makesdna` does not allow empty structs. */ } UserDef_Experimental; |