diff options
author | Campbell Barton <campbell@blender.org> | 2022-01-07 07:13:31 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-01-07 07:15:08 +0300 |
commit | b3dc1a17a0e7b7e38a8ece70ca0d353aff82c154 (patch) | |
tree | 2eec6693f681341e9b9235ed639489aa3d217eb3 /source/blender/blenlib | |
parent | 2cd8238ce3394aa3cf89c4d8c17c71757dd61a08 (diff) |
Fix BKE_image_ensure_tile_token being called with a full path
Assert that only the file name component is passed in
since special handling for UDIM should only be applied to the file name.
Also remove an unnecessary NULL check on the filename argument.
Diffstat (limited to 'source/blender/blenlib')
-rw-r--r-- | source/blender/blenlib/BLI_path_util.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenlib/BLI_path_util.h b/source/blender/blenlib/BLI_path_util.h index 85d4ed4a307..16f479cb3b8 100644 --- a/source/blender/blenlib/BLI_path_util.h +++ b/source/blender/blenlib/BLI_path_util.h @@ -142,7 +142,11 @@ bool BLI_path_contains(const char *container_path, const char *containee_path) ATTR_WARN_UNUSED_RESULT; /** - * Returns pointer to the rightmost path separator in string. + * \return pointer to the leftmost path separator in string (or NULL when not found). + */ +const char *BLI_path_slash_find(const char *string) ATTR_NONNULL() ATTR_WARN_UNUSED_RESULT; +/** + * \return pointer to the rightmost path separator in string (or NULL when not found). */ const char *BLI_path_slash_rfind(const char *string) ATTR_NONNULL() ATTR_WARN_UNUSED_RESULT; /** @@ -155,10 +159,6 @@ int BLI_path_slash_ensure(char *string) ATTR_NONNULL(); */ void BLI_path_slash_rstrip(char *string) ATTR_NONNULL(); /** - * Returns pointer to the leftmost path separator in string. Not actually used anywhere. - */ -const char *BLI_path_slash_find(const char *string) ATTR_NONNULL() ATTR_WARN_UNUSED_RESULT; -/** * Changes to the path separators to the native ones for this OS. */ void BLI_path_slash_native(char *path) ATTR_NONNULL(); |