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/editors/space_info/info_ops.c | |
| 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/editors/space_info/info_ops.c')
| -rw-r--r-- | source/blender/editors/space_info/info_ops.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_info/info_ops.c b/source/blender/editors/space_info/info_ops.c index 82927bd21b1..d9932436413 100644 --- a/source/blender/editors/space_info/info_ops.c +++ b/source/blender/editors/space_info/info_ops.c @@ -123,12 +123,12 @@ static int autopack_toggle_exec(bContext *C, wmOperator *op) { Main *bmain = CTX_data_main(C); - if (G.fileflags & G_AUTOPACK) { - G.fileflags &= ~G_AUTOPACK; + if (G.fileflags & G_FILE_AUTOPACK) { + G.fileflags &= ~G_FILE_AUTOPACK; } else { packAll(bmain, op->reports, true); - G.fileflags |= G_AUTOPACK; + G.fileflags |= G_FILE_AUTOPACK; } return OPERATOR_FINISHED; @@ -219,7 +219,7 @@ static int unpack_all_exec(bContext *C, wmOperator *op) int method = RNA_enum_get(op->ptr, "method"); if (method != PF_KEEP) unpackAll(bmain, op->reports, method); /* XXX PF_ASK can't work here */ - G.fileflags &= ~G_AUTOPACK; + G.fileflags &= ~G_FILE_AUTOPACK; return OPERATOR_FINISHED; } @@ -236,7 +236,7 @@ static int unpack_all_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED( if (!count) { BKE_report(op->reports, RPT_WARNING, "No packed files to unpack"); - G.fileflags &= ~G_AUTOPACK; + G.fileflags &= ~G_FILE_AUTOPACK; return OPERATOR_CANCELLED; } @@ -304,7 +304,7 @@ static int unpack_item_exec(bContext *C, wmOperator *op) if (method != PF_KEEP) BKE_unpack_id(bmain, id, op->reports, method); /* XXX PF_ASK can't work here */ - G.fileflags &= ~G_AUTOPACK; + G.fileflags &= ~G_FILE_AUTOPACK; return OPERATOR_FINISHED; } |