Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
-rw-r--r--source/blender/makesdna/DNA_userdef_types.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 7a09059e344..019e4c9ea9e 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -619,9 +619,8 @@ typedef struct UserDef_FileSpaceData {
typedef struct UserDef_Experimental {
char use_undo_legacy;
- char use_menu_search;
/** `makesdna` does not allow empty structs. */
- char _pad0[6];
+ char _pad0[7];
} UserDef_Experimental;
#define USER_EXPERIMENTAL_TEST(userdef, member) \
@@ -874,9 +873,11 @@ typedef struct UserDef {
int sequencer_disk_cache_compression; /* eUserpref_DiskCacheCompression */
int sequencer_disk_cache_size_limit;
short sequencer_disk_cache_flag;
-
char _pad5[2];
+ float collection_instance_empty_size;
+ char _pad10[4];
+
struct WalkNavigation walk_navigation;
/** The UI for the user preferences. */
@@ -1290,8 +1291,8 @@ typedef enum eUserpref_RenderDisplayType {
} eUserpref_RenderDisplayType;
typedef enum eUserpref_TempSpaceDisplayType {
- USER_TEMP_SPACE_DISPLAY_FULLSCREEN,
- USER_TEMP_SPACE_DISPLAY_WINDOW,
+ USER_TEMP_SPACE_DISPLAY_FULLSCREEN = 0,
+ USER_TEMP_SPACE_DISPLAY_WINDOW = 1,
} eUserpref_TempSpaceDisplayType;
typedef enum eUserpref_EmulateMMBMod {