diff options
author | YimingWu <xp8110@outlook.com> | 2021-07-04 08:25:58 +0300 |
---|---|---|
committer | YimingWu <xp8110@outlook.com> | 2021-07-04 08:25:58 +0300 |
commit | c56ef6fd89c149a87afe62dffc81c9083dd7a2c2 (patch) | |
tree | 8056bfb005fbb664e0e09ce84a5ee80397971859 /source/blender/imbuf/intern | |
parent | 442f269a72e8f07393fd246f642e210171a1c9bc (diff) | |
parent | b73dc36859e03845f702a3e985b536ac9afef63a (diff) |
Merge remote-tracking branch 'origin/master' into lineart-bvhlineart-bvh
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r-- | source/blender/imbuf/intern/dds/dds_api.cpp | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/oiio/openimageio_api.cpp | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/thumbs.c | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/thumbs_blend.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/imbuf/intern/dds/dds_api.cpp b/source/blender/imbuf/intern/dds/dds_api.cpp index e767cb14b1a..1729a9a64f8 100644 --- a/source/blender/imbuf/intern/dds/dds_api.cpp +++ b/source/blender/imbuf/intern/dds/dds_api.cpp @@ -44,7 +44,7 @@ extern "C" { bool imb_save_dds(struct ImBuf *ibuf, const char *name, int /*flags*/) { - return false; /* todo: finish this function */ + return false; /* TODO: finish this function. */ /* check image buffer */ if (ibuf == nullptr) { diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp index 65c25194477..0941338160d 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -156,7 +156,7 @@ static ImBuf *imb_oiio_load_image_float( /* ImBuf always needs 4 channels */ fill_all_channels((float *)ibuf->rect_float, width, height, components, 1.0f); - /* Note: Photoshop 16 bit files never has alpha with it, + /* NOTE: Photoshop 16 bit files never has alpha with it, * so no need to handle associated/unassociated alpha. */ return ibuf; } diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c index db80d168e53..19f34a6aacd 100644 --- a/source/blender/imbuf/intern/thumbs.c +++ b/source/blender/imbuf/intern/thumbs.c @@ -172,7 +172,7 @@ static const unsigned char acceptable[96] = { static const char hex[17] = "0123456789abcdef"; -/* Note: This escape function works on file: URIs, but if you want to +/* NOTE: This escape function works on file: URIs, but if you want to * escape something else, please read RFC-2396 */ static void escape_uri_string(const char *string, char *escaped_string, diff --git a/source/blender/imbuf/intern/thumbs_blend.c b/source/blender/imbuf/intern/thumbs_blend.c index eb518828913..759f96af7c8 100644 --- a/source/blender/imbuf/intern/thumbs_blend.c +++ b/source/blender/imbuf/intern/thumbs_blend.c @@ -56,7 +56,7 @@ ImBuf *IMB_thumb_load_blend(const char *blen_path, const char *blen_group, const return ima; } - /* Note: we should handle all previews for a same group at once, would avoid reopening + /* NOTE: we should handle all previews for a same group at once, would avoid reopening * `.blend` file for each and every ID. However, this adds some complexity, * so keep it for later. */ names = BLO_blendhandle_get_datablock_names(libfiledata, idcode, false, &nnames); |