diff options
author | Campbell Barton <campbell@blender.org> | 2022-05-12 07:05:45 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-05-12 07:06:35 +0300 |
commit | 51fdf4bdfc13e5cec2b34030508b3caaa4a7fef8 (patch) | |
tree | cbf5ba0e15bc8e51812957bd4397a0ec6c38dd29 | |
parent | 578771ae4dcb8643214c69a7b9761ca154f40f63 (diff) |
Cleanup: discarded-qualifier warning, mixing enum/ints
-rw-r--r-- | source/blender/blenkernel/BKE_image.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image.cc | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_utils.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h index 42d0e66cf49..25f20b82900 100644 --- a/source/blender/blenkernel/BKE_image.h +++ b/source/blender/blenkernel/BKE_image.h @@ -454,7 +454,7 @@ bool BKE_image_is_dirty_writable(struct Image *image, bool *r_is_writable); int BKE_image_sequence_guess_offset(struct Image *image); bool BKE_image_has_anim(struct Image *image); bool BKE_image_has_packedfile(const struct Image *image); -bool BKE_image_has_filepath(struct Image *ima); +bool BKE_image_has_filepath(const struct Image *ima); /** * Checks the image buffer changes with time (not keyframed values). */ diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc index 27de9a37728..3d894f47ae0 100644 --- a/source/blender/blenkernel/intern/image.cc +++ b/source/blender/blenkernel/intern/image.cc @@ -5124,7 +5124,7 @@ bool BKE_image_has_packedfile(const Image *ima) return (BLI_listbase_is_empty(&ima->packedfiles) == false); } -bool BKE_image_has_filepath(Image *ima) +bool BKE_image_has_filepath(const Image *ima) { /* This could be improved to detect cases like //../../, currently path * remapping empty file paths empty. */ diff --git a/source/blender/editors/interface/interface_utils.cc b/source/blender/editors/interface/interface_utils.cc index 47ba3433a9c..e68d8f12a1f 100644 --- a/source/blender/editors/interface/interface_utils.cc +++ b/source/blender/editors/interface/interface_utils.cc @@ -494,7 +494,7 @@ static bool add_collection_search_item(CollItemSearch *cis, cis->name, cis->data, cis->iconid, - cis->has_sep_char ? UI_BUT_HAS_SEP_CHAR : 0, + cis->has_sep_char ? (uint64_t)UI_BUT_HAS_SEP_CHAR : 0, name_prefix_offset); } |