Cleanup: quiet compiler warnings
This commit is contained in:
@@ -4112,7 +4112,8 @@ static void rna_generate_property(FILE *f, StructRNA *srna, const char *nest, Pr
|
||||
prop->totarraylength);
|
||||
fprintf(f,
|
||||
"\t%s%s, %d, %s, %s, %s, %s, %s,\n",
|
||||
(prop->flag & PROP_CONTEXT_UPDATE) ? "(UpdateFunc)" : "",
|
||||
/* NOTE: void cast is needed to quiet function cast warning in C++. */
|
||||
(prop->flag & PROP_CONTEXT_UPDATE) ? "(UpdateFunc)(void *)" : "",
|
||||
rna_function_string(prop->update),
|
||||
prop->noteflag,
|
||||
rna_function_string(prop->editable),
|
||||
|
||||
@@ -272,7 +272,7 @@ static void rna_Curve_texspace_set(Main * /*bmain*/, Scene * /*scene*/, PointerR
|
||||
static int rna_Curve_texspace_editable(PointerRNA *ptr, const char ** /*r_info*/)
|
||||
{
|
||||
Curve *cu = static_cast<Curve *>(ptr->data);
|
||||
return (cu->texspace_flag & CU_TEXSPACE_FLAG_AUTO) ? 0 : PROP_EDITABLE;
|
||||
return (cu->texspace_flag & CU_TEXSPACE_FLAG_AUTO) ? PropertyFlag(0) : PROP_EDITABLE;
|
||||
}
|
||||
|
||||
static void rna_Curve_texspace_location_get(PointerRNA *ptr, float *values)
|
||||
|
||||
@@ -4747,7 +4747,8 @@ void rna_ShaderNodePointDensity_density_calc(bNode *self,
|
||||
|
||||
/* We're done, time to clean up. */
|
||||
BKE_texture_pointdensity_free_data(pd);
|
||||
memset(pd, 0, sizeof(*pd));
|
||||
*pd = blender::dna::shallow_zero_initialize();
|
||||
|
||||
shader_point_density->cached_resolution = 0.0f;
|
||||
}
|
||||
|
||||
|
||||
@@ -1083,7 +1083,7 @@ static int rna_Object_active_material_editable(PointerRNA *ptr, const char ** /*
|
||||
is_editable = ob->data ? !ID_IS_LINKED(ob->data) : false;
|
||||
}
|
||||
|
||||
return is_editable ? PROP_EDITABLE : 0;
|
||||
return is_editable ? int(PROP_EDITABLE) : 0;
|
||||
}
|
||||
|
||||
static void rna_Object_active_particle_system_index_range(
|
||||
@@ -1269,7 +1269,7 @@ static int rna_MaterialSlot_material_editable(PointerRNA *ptr, const char ** /*r
|
||||
is_editable = ob->data ? !ID_IS_LINKED(ob->data) : false;
|
||||
}
|
||||
|
||||
return is_editable ? PROP_EDITABLE : 0;
|
||||
return is_editable ? int(PROP_EDITABLE) : 0;
|
||||
}
|
||||
|
||||
static PointerRNA rna_MaterialSlot_material_get(PointerRNA *ptr)
|
||||
|
||||
@@ -1230,7 +1230,7 @@ static int rna_3DViewShading_type_get(PointerRNA *ptr)
|
||||
return shading->type;
|
||||
}
|
||||
else if (BKE_scene_uses_blender_workbench(scene)) {
|
||||
return (shading->type == OB_MATERIAL) ? OB_SOLID : shading->type;
|
||||
return (shading->type == OB_MATERIAL) ? int(OB_SOLID) : shading->type;
|
||||
}
|
||||
else {
|
||||
if (shading->type == OB_RENDER && !(type && type->view_draw)) {
|
||||
@@ -2710,7 +2710,7 @@ int rna_FileSelectParams_filename_editable(struct PointerRNA *ptr, const char **
|
||||
return 0;
|
||||
}
|
||||
|
||||
return params ? PROP_EDITABLE : 0;
|
||||
return params ? int(PROP_EDITABLE) : 0;
|
||||
}
|
||||
|
||||
static bool rna_FileSelectParams_use_lib_get(PointerRNA *ptr)
|
||||
@@ -2952,7 +2952,7 @@ static int rna_FileBrowser_FSMenuEntry_name_get_editable(PointerRNA *ptr, const
|
||||
{
|
||||
FSMenuEntry *fsm = static_cast<FSMenuEntry *>(ptr->data);
|
||||
|
||||
return fsm->save ? PROP_EDITABLE : 0;
|
||||
return fsm->save ? int(PROP_EDITABLE) : 0;
|
||||
}
|
||||
|
||||
static int rna_FileBrowser_FSMenuEntry_icon_get(PointerRNA *ptr)
|
||||
|
||||
Reference in New Issue
Block a user