diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-02 05:39:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-02 05:49:13 +0300 |
| commit | afcbf7cf1357723f59eca8e118a0ca9ef6cf6555 (patch) | |
| tree | 95c520cd1e556f3cf1fa0a799bc23efe649cf22c /source/blender/makesrna | |
| parent | a53011d52012067ad1334d654a68c97327005626 (diff) | |
Cleanup: use G_FLAG_*/G_FILE_* for G.f/fileflags
Was confusing eg: G_AUTOPACK belonged to G.fileflags, G_PICKSEL to G.f.
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_main.c | 6 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_main.c b/source/blender/makesrna/intern/rna_main.c index 12b62b0f2fc..4bba1dd6181 100644 --- a/source/blender/makesrna/intern/rna_main.c +++ b/source/blender/makesrna/intern/rna_main.c @@ -39,7 +39,7 @@ static bool rna_Main_use_autopack_get(PointerRNA *UNUSED(ptr)) { - if (G.fileflags & G_AUTOPACK) + if (G.fileflags & G_FILE_AUTOPACK) return 1; return 0; @@ -48,9 +48,9 @@ static bool rna_Main_use_autopack_get(PointerRNA *UNUSED(ptr)) static void rna_Main_use_autopack_set(PointerRNA *UNUSED(ptr), bool value) { if (value) - G.fileflags |= G_AUTOPACK; + G.fileflags |= G_FILE_AUTOPACK; else - G.fileflags &= ~G_AUTOPACK; + G.fileflags &= ~G_FILE_AUTOPACK; } static bool rna_Main_is_saved_get(PointerRNA *UNUSED(ptr)) diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 201684d5fc0..0cffbcb2b9c 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -163,8 +163,8 @@ static void rna_userdef_language_update(Main *UNUSED(bmain), Scene *UNUSED(scene static void rna_userdef_script_autoexec_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { UserDef *userdef = (UserDef *)ptr->data; - if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_SCRIPT_AUTOEXEC; - else G.f |= G_SCRIPT_AUTOEXEC; + if (userdef->flag & USER_SCRIPT_AUTOEXEC_DISABLE) G.f &= ~G_FLAG_SCRIPT_AUTOEXEC; + else G.f |= G_FLAG_SCRIPT_AUTOEXEC; } static void rna_userdef_load_ui_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) |