diff options
author | Colin Basnett <cmbasnett@gmail.com> | 2022-09-17 03:50:37 +0300 |
---|---|---|
committer | Colin Basnett <cmbasnett@gmail.com> | 2022-09-17 03:50:37 +0300 |
commit | 564bda241a973396da51d7c3ccd9efd97d51728a (patch) | |
tree | 4d9aa4cccd82e2e606b47774afa5e1015bf14768 /source/blender/blenkernel/BKE_image_format.h | |
parent | 0fff238150d076576053c25b646f653d6e3b0edb (diff) | |
parent | 48d7ff68f0df209c77bbb081ab46fbc109fd825a (diff) |
Merge branch 'master' into feature-imformatfeature-imformat
Diffstat (limited to 'source/blender/blenkernel/BKE_image_format.h')
-rw-r--r-- | source/blender/blenkernel/BKE_image_format.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_image_format.h b/source/blender/blenkernel/BKE_image_format.h index 6a03d1d8df5..8f71e1f4648 100644 --- a/source/blender/blenkernel/BKE_image_format.h +++ b/source/blender/blenkernel/BKE_image_format.h @@ -69,7 +69,7 @@ char BKE_imtype_valid_depths(char imtype); * String is from command line `--render-format` argument, * keep in sync with `creator_args.c` help info. */ -char BKE_imtype_from_arg(const char *arg); +char BKE_imtype_from_arg(const char *imtype_arg); /* Conversion between ImBuf settings. */ |