archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

Cleanup: discarded-qualifier warning, mixing enum/ints

Browse Source
This commit is contained in:
Campbell Barton
2022-05-12 14:05:45 +10:00
parent 578771ae4d
commit 51fdf4bdfc
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_image.h
View File

@@ -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).
*/

2
source/blender/blenkernel/intern/image.cc
View File

@@ -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. */

2
source/blender/editors/interface/interface_utils.cc
View File

@@ -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);
}