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_image | |
| 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_image')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 8221227bdd1..60c7b4e2b66 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -2810,7 +2810,7 @@ static int image_unpack_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - if (G.fileflags & G_AUTOPACK) + if (G.fileflags & G_FILE_AUTOPACK) BKE_report(op->reports, RPT_WARNING, "AutoPack is enabled, so image will be packed again on file save"); /* XXX unpackImage frees image buffers */ @@ -2838,7 +2838,7 @@ static int image_unpack_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSE return OPERATOR_CANCELLED; } - if (G.fileflags & G_AUTOPACK) + if (G.fileflags & G_FILE_AUTOPACK) BKE_report(op->reports, RPT_WARNING, "AutoPack is enabled, so image will be packed again on file save"); unpack_menu(C, "IMAGE_OT_unpack", ima->id.name + 2, ima->name, "textures", BKE_image_has_packedfile(ima) ? ((ImagePackedFile *)ima->packedfiles.first)->packedfile : NULL); |