diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2019-03-12 18:17:47 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2019-03-12 18:17:59 +0300 |
| commit | 834d3962b99df675788021766679e7e889694926 (patch) | |
| tree | 998b8ead67f857746aaae06ce0a9ccfbd12588a1 /source/blender/blenkernel/intern/image.c | |
| parent | e28f0f179d2a4c5f547c8fce6f010e7b733d6887 (diff) | |
Use the same string for DNA enum and CLI argument for EXR image format setting
The `--render-format` CLI option takes `EXR` and `MULTILAYER`, whereas
the DNA image format render setting uses `OPEN_EXR` and
`OPEN_EXR_MULTILAYER`. This commit adds the DNA values to the CLI
argument, so that it is possible to take the selected value from DNA and
pass it as-is to the CLI. This is used in Flamenco, for example.
The `OPEN_EXR` and `OPEN_EXR_MULTILAYER` are now aliases, so both the
existing and the new options keep working.
Reviewers: campbellbarton, brecht
Reviewed By: brecht
Subscribers: fsiddi
Tags: #bf_blender_2.8
Differential Revision: https://developer.blender.org/D4502
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index f49858944fa..5955c941285 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -1259,6 +1259,8 @@ char BKE_imtype_from_arg(const char *imtype_arg) else if (STREQ(imtype_arg, "TIFF")) return R_IMF_IMTYPE_TIFF; #endif #ifdef WITH_OPENEXR + else if (STREQ(imtype_arg, "OPEN_EXR")) return R_IMF_IMTYPE_OPENEXR; + else if (STREQ(imtype_arg, "OPEN_EXR_MULTILAYER")) return R_IMF_IMTYPE_MULTILAYER; else if (STREQ(imtype_arg, "EXR")) return R_IMF_IMTYPE_OPENEXR; else if (STREQ(imtype_arg, "MULTILAYER")) return R_IMF_IMTYPE_MULTILAYER; #endif |