diff options
| author | Campbell Barton <campbell@blender.org> | 2022-11-10 03:34:43 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-11-10 03:34:43 +0300 |
| commit | baabac5909204000664e675095e0340b4833f67d (patch) | |
| tree | 7048e94ccbcf2592b8b4cfaa00d4ab25705a663c /source/blender/imbuf | |
| parent | 7d606ad3b86b4dabfeaa0dc3eecaf2b0d803f46d (diff) | |
| parent | 8140f7f5741d954b95bc3eaade55c213a385e6cd (diff) | |
Merge branch 'blender-v3.4-release'
Diffstat (limited to 'source/blender/imbuf')
| -rw-r--r-- | source/blender/imbuf/intern/jp2.c | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/openexr/openexr_api.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c index f3d6d19cb8d..4320f870d64 100644 --- a/source/blender/imbuf/intern/jp2.c +++ b/source/blender/imbuf/intern/jp2.c @@ -125,7 +125,7 @@ struct BufInfo { static void opj_read_from_buffer_free(void *UNUSED(p_user_data)) { - /* nop */ + /* NOP. */ } static OPJ_SIZE_T opj_read_from_buffer(void *p_buffer, OPJ_SIZE_T p_nb_bytes, void *p_user_data) diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp b/source/blender/imbuf/intern/openexr/openexr_api.cpp index d4a89c9e1c9..d2bdb5041c5 100644 --- a/source/blender/imbuf/intern/openexr/openexr_api.cpp +++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp @@ -811,7 +811,7 @@ static void imb_exr_get_views(MultiPartInputFile &file, StringVector &views) } } -/* Multilayer Blender files have the view name in all the passes (even the default view one) */ +/* Multi-layer Blender files have the view name in all the passes (even the default view one). */ static void imb_exr_insert_view_name(char *name_full, const char *passname, const char *viewname) { BLI_assert(!ELEM(name_full, passname, viewname)); |