Cleanup: use matching function signatures for RNA callbacks
Use matching int/float/boo types for RNA callbacks.
This commit is contained in:
parent
4a0dd1d435
commit
5bd4aea29c
|
@ -322,7 +322,7 @@ int rna_ID_name_full_length(PointerRNA *ptr)
|
|||
return strlen(name);
|
||||
}
|
||||
|
||||
static int rna_ID_is_evaluated_get(PointerRNA *ptr)
|
||||
static bool rna_ID_is_evaluated_get(PointerRNA *ptr)
|
||||
{
|
||||
ID *id = (ID *)ptr->data;
|
||||
|
||||
|
|
|
@ -765,11 +765,11 @@ static void rna_Brush_set_size(PointerRNA *ptr, int value)
|
|||
brush->size = value;
|
||||
}
|
||||
|
||||
static void rna_Brush_use_gradient_set(PointerRNA *ptr, bool value)
|
||||
static void rna_Brush_use_gradient_set(PointerRNA *ptr, int value)
|
||||
{
|
||||
Brush *br = (Brush *)ptr->data;
|
||||
|
||||
if (value) {
|
||||
if (value & BRUSH_USE_GRADIENT) {
|
||||
br->flag |= BRUSH_USE_GRADIENT;
|
||||
}
|
||||
else {
|
||||
|
|
|
@ -67,7 +67,7 @@ static PointerRNA rna_DepsgraphObjectInstance_object_get(PointerRNA *ptr)
|
|||
return rna_pointer_inherit_refine(ptr, &RNA_Object, di->iter.current);
|
||||
}
|
||||
|
||||
static int rna_DepsgraphObjectInstance_is_instance_get(PointerRNA *ptr)
|
||||
static bool rna_DepsgraphObjectInstance_is_instance_get(PointerRNA *ptr)
|
||||
{
|
||||
RNA_DepsgraphIterator *di = ptr->data;
|
||||
DEGObjectIterData *deg_iter = (DEGObjectIterData *)di->iter.data;
|
||||
|
@ -137,12 +137,12 @@ static void rna_DepsgraphObjectInstance_persistent_id_get(PointerRNA *ptr, int *
|
|||
}
|
||||
}
|
||||
|
||||
static unsigned int rna_DepsgraphObjectInstance_random_id_get(PointerRNA *ptr)
|
||||
static int rna_DepsgraphObjectInstance_random_id_get(PointerRNA *ptr)
|
||||
{
|
||||
RNA_DepsgraphIterator *di = ptr->data;
|
||||
DEGObjectIterData *deg_iter = (DEGObjectIterData *)di->iter.data;
|
||||
if (deg_iter->dupli_object_current != NULL) {
|
||||
return deg_iter->dupli_object_current->random_id;
|
||||
return (int)deg_iter->dupli_object_current->random_id;
|
||||
}
|
||||
else {
|
||||
return 0;
|
||||
|
|
|
@ -367,13 +367,13 @@ static char *rna_GpencilColorData_path(const PointerRNA *UNUSED(ptr))
|
|||
return BLI_strdup("grease_pencil");
|
||||
}
|
||||
|
||||
static int rna_GpencilColorData_is_stroke_visible_get(PointerRNA *ptr)
|
||||
static bool rna_GpencilColorData_is_stroke_visible_get(PointerRNA *ptr)
|
||||
{
|
||||
MaterialGPencilStyle *pcolor = ptr->data;
|
||||
return (pcolor->stroke_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH);
|
||||
}
|
||||
|
||||
static int rna_GpencilColorData_is_fill_visible_get(PointerRNA *ptr)
|
||||
static bool rna_GpencilColorData_is_fill_visible_get(PointerRNA *ptr)
|
||||
{
|
||||
MaterialGPencilStyle *pcolor = (MaterialGPencilStyle *)ptr->data;
|
||||
return ((pcolor->fill_rgba[3] > GPENCIL_ALPHA_OPACITY_THRESH) || (pcolor->fill_style > 0));
|
||||
|
|
|
@ -801,7 +801,7 @@ static bool rna_MPoly_freestyle_face_mark_get(PointerRNA *ptr)
|
|||
return ffa && (ffa->flag & FREESTYLE_FACE_MARK) != 0;
|
||||
}
|
||||
|
||||
static void rna_MPoly_freestyle_face_mark_set(PointerRNA *ptr, int value)
|
||||
static void rna_MPoly_freestyle_face_mark_set(PointerRNA *ptr, bool value)
|
||||
{
|
||||
Mesh *me = rna_mesh(ptr);
|
||||
const int index = rna_MeshPolygon_index_get(ptr);
|
||||
|
|
|
@ -2229,7 +2229,7 @@ bool rna_GPencil_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value)
|
|||
return ((Object *)value.owner_id)->type == OB_GPENCIL;
|
||||
}
|
||||
|
||||
int rna_Object_use_dynamic_topology_sculpting_get(PointerRNA *ptr)
|
||||
bool rna_Object_use_dynamic_topology_sculpting_get(PointerRNA *ptr)
|
||||
{
|
||||
SculptSession *ss = ((Object *)ptr->owner_id)->sculpt;
|
||||
return (ss && ss->bm);
|
||||
|
|
|
@ -1044,7 +1044,7 @@ static float rna_PartSetting_linelenhead_get(struct PointerRNA *ptr)
|
|||
return settings->draw_line[1];
|
||||
}
|
||||
|
||||
static int rna_PartSettings_is_fluid_get(PointerRNA *ptr)
|
||||
static bool rna_PartSettings_is_fluid_get(PointerRNA *ptr)
|
||||
{
|
||||
ParticleSettings *part = ptr->data;
|
||||
return (ELEM(part->type,
|
||||
|
|
|
@ -1145,7 +1145,7 @@ static bool rna_Function_no_self_get(PointerRNA *ptr)
|
|||
return !(func->flag & FUNC_NO_SELF);
|
||||
}
|
||||
|
||||
static int rna_Function_use_self_type_get(PointerRNA *ptr)
|
||||
static bool rna_Function_use_self_type_get(PointerRNA *ptr)
|
||||
{
|
||||
FunctionRNA *func = (FunctionRNA *)ptr->data;
|
||||
return 0 != (func->flag & FUNC_USE_SELF_TYPE);
|
||||
|
|
|
@ -324,7 +324,7 @@ static int rna_Sequence_frame_final_end_get(PointerRNA *ptr)
|
|||
return SEQ_time_right_handle_frame_get(scene, (Sequence *)ptr->data);
|
||||
}
|
||||
|
||||
static void rna_Sequence_start_frame_final_set(PointerRNA *ptr, float value)
|
||||
static void rna_Sequence_start_frame_final_set(PointerRNA *ptr, int value)
|
||||
{
|
||||
Sequence *seq = (Sequence *)ptr->data;
|
||||
Scene *scene = (Scene *)ptr->owner_id;
|
||||
|
|
|
@ -1100,7 +1100,7 @@ static bool rna_RegionView3D_is_orthographic_side_view_get(PointerRNA *ptr)
|
|||
return RV3D_VIEW_IS_AXIS(rv3d->view);
|
||||
}
|
||||
|
||||
static void rna_RegionView3D_is_orthographic_side_view_set(PointerRNA *ptr, int value)
|
||||
static void rna_RegionView3D_is_orthographic_side_view_set(PointerRNA *ptr, bool value)
|
||||
{
|
||||
RegionView3D *rv3d = (RegionView3D *)(ptr->data);
|
||||
const bool was_axis_view = RV3D_VIEW_IS_AXIS(rv3d->view);
|
||||
|
@ -1609,7 +1609,7 @@ static void rna_SpaceImageEditor_mode_update(Main *bmain, Scene *scene, PointerR
|
|||
}
|
||||
}
|
||||
|
||||
static void rna_SpaceImageEditor_show_stereo_set(PointerRNA *ptr, int value)
|
||||
static void rna_SpaceImageEditor_show_stereo_set(PointerRNA *ptr, bool value)
|
||||
{
|
||||
SpaceImage *sima = (SpaceImage *)(ptr->data);
|
||||
|
||||
|
|
|
@ -440,7 +440,7 @@ static PointerRNA rna_Panel_custom_data_get(PointerRNA *ptr)
|
|||
}
|
||||
|
||||
/* UIList */
|
||||
static unsigned int rna_UIList_filter_const_FILTER_ITEM_get(PointerRNA *UNUSED(ptr))
|
||||
static int rna_UIList_filter_const_FILTER_ITEM_get(PointerRNA *UNUSED(ptr))
|
||||
{
|
||||
return UILST_FLT_ITEM;
|
||||
}
|
||||
|
|
|
@ -353,7 +353,7 @@ static PointerRNA rna_Gizmo_properties_get(PointerRNA *ptr)
|
|||
}
|
||||
|
||||
# define RNA_GIZMO_FLAG_RO_DEF(func_id, member_id, flag_value) \
|
||||
static int rna_Gizmo_##func_id##_get(PointerRNA *ptr) \
|
||||
static bool rna_Gizmo_##func_id##_get(PointerRNA *ptr) \
|
||||
{ \
|
||||
wmGizmo *gz = ptr->data; \
|
||||
return (gz->member_id & flag_value) != 0; \
|
||||
|
|
|
@ -193,7 +193,7 @@ static int rna_WorkSpaceTool_index_get(PointerRNA *ptr)
|
|||
return (tref->runtime) ? tref->runtime->index : 0;
|
||||
}
|
||||
|
||||
static int rna_WorkSpaceTool_has_datablock_get(PointerRNA *ptr)
|
||||
static bool rna_WorkSpaceTool_has_datablock_get(PointerRNA *ptr)
|
||||
{
|
||||
bToolRef *tref = ptr->data;
|
||||
return (tref->runtime) ? (tref->runtime->data_block[0] != '\0') : false;
|
||||
|
|
Loading…
Reference in New Issue