blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Cleanup: Fix compiler warnings

This commit is contained in:
Hans Goudey 2022-04-28 10:53:50 -05:00
parent 024386bb89
commit 099120e54a
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/image_format.cc
View File

@ -514,8 +514,9 @@ static bool do_add_image_extension(char *string,
#endif
#ifdef WITH_WEBP
else if (imtype == R_IMF_IMTYPE_WEBP) {
if (!BLI_path_extension_check(string, extension_test = ".webp"))
if (!BLI_path_extension_check(string, extension_test = ".webp")) {
extension = extension_test;
}
}
#endif
else { // R_IMF_IMTYPE_AVIRAW, R_IMF_IMTYPE_AVIJPEG, R_IMF_IMTYPE_JPEG90 etc

6
source/blender/blenkernel/intern/key.c
View File

@ -1759,7 +1759,7 @@ Key *BKE_key_from_id(ID *id)
return NULL;
}
Key **BKE_key_from_object_p( Object *ob)
Key **BKE_key_from_object_p(Object *ob)
{
if (ob == NULL || ob->data == NULL) {
return NULL;
@ -1768,7 +1768,7 @@ Key **BKE_key_from_object_p( Object *ob)
return BKE_key_from_id_p(ob->data);
}
Key *BKE_key_from_object( Object *ob)
Key *BKE_key_from_object(Object *ob)
{
Key **key_p;
key_p = BKE_key_from_object_p(ob);
@ -1922,7 +1922,7 @@ char *BKE_keyblock_curval_rnapath_get(const Key *key, const KeyBlock *kb)
}
/* create the RNA pointer */
RNA_pointer_create(&key->id, &RNA_ShapeKey, kb, &ptr);
RNA_pointer_create((ID *)&key->id, &RNA_ShapeKey, (KeyBlock *)kb, &ptr);
/* get pointer to the property too */
prop = RNA_struct_find_property(&ptr, "value");

2
source/blender/blenkernel/intern/modifier.c
View File

@ -682,7 +682,7 @@ ModifierData *BKE_modifiers_get_virtual_modifierlist(const Object *ob,
}
/* shape key modifier, not yet for curves */
if (ELEM(ob->type, OB_MESH, OB_LATTICE) && BKE_key_from_object(ob)) {
if (ELEM(ob->type, OB_MESH, OB_LATTICE) && BKE_key_from_object((Object *)ob)) {
if (ob->type == OB_MESH && (ob->shapeflag & OB_SHAPE_EDIT_MODE)) {
virtualModifierData->smd.modifier.mode |= eModifierMode_Editmode | eModifierMode_OnCage;
}

2
source/blender/editors/geometry/geometry_attributes.cc
View File

@ -344,7 +344,7 @@ static int geometry_attribute_convert_exec(bContext *C, wmOperator *op)
return OPERATOR_FINISHED;
}
void geometry_color_attribute_add_ui(bContext *C, wmOperator *op)
static void geometry_color_attribute_add_ui(bContext *UNUSED(C), wmOperator *op)
{
uiLayout *layout = op->layout;
uiLayoutSetPropSep(layout, true);