diff options
Diffstat (limited to 'source/blender/makesrna/intern')
-rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_action.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_animation.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_constraint.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_curve.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 16 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_internal_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_modifier.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 22 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_object.c | 12 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sculpt_paint.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_sequencer.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_ui.c | 6 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_wm.c | 4 |
15 files changed, 45 insertions, 45 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index c042c024652..2a74aedd60a 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -1362,7 +1362,7 @@ StructRNA *RNA_property_pointer_type(PointerRNA *ptr, PropertyRNA *prop) return &RNA_UnknownType; } -int RNA_property_pointer_poll(PointerRNA *ptr, PropertyRNA *prop, PointerRNA *value) +bool RNA_property_pointer_poll(PointerRNA *ptr, PropertyRNA *prop, PointerRNA *value) { prop = rna_ensure_property(prop); diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c index 6985cb54359..675ed42a6d2 100644 --- a/source/blender/makesrna/intern/rna_action.c +++ b/source/blender/makesrna/intern/rna_action.c @@ -223,7 +223,7 @@ static void rna_Action_frame_range_get(PointerRNA *ptr, float *values) /* used to check if an action (value pointer) is suitable to be assigned to the ID-block that is ptr */ -int rna_Action_id_poll(PointerRNA *ptr, PointerRNA value) +bool rna_Action_id_poll(PointerRNA *ptr, PointerRNA value) { ID *srcId = (ID *)ptr->id.data; bAction *act = (bAction *)value.id.data; @@ -243,7 +243,7 @@ int rna_Action_id_poll(PointerRNA *ptr, PointerRNA value) } /* used to check if an action (value pointer) can be assigned to Action Editor given current mode */ -int rna_Action_actedit_assign_poll(PointerRNA *ptr, PointerRNA value) +bool rna_Action_actedit_assign_poll(PointerRNA *ptr, PointerRNA value) { SpaceAction *saction = (SpaceAction *)ptr->data; bAction *act = (bAction *)value.id.data; diff --git a/source/blender/makesrna/intern/rna_animation.c b/source/blender/makesrna/intern/rna_animation.c index 8f964389963..623eccc9ee5 100644 --- a/source/blender/makesrna/intern/rna_animation.c +++ b/source/blender/makesrna/intern/rna_animation.c @@ -138,7 +138,7 @@ static void rna_AnimData_tweakmode_set(PointerRNA *ptr, const int value) /* ****************************** */ /* wrapper for poll callback */ -static int RKS_POLL_rna_internal(KeyingSetInfo *ksi, bContext *C) +static bool RKS_POLL_rna_internal(KeyingSetInfo *ksi, bContext *C) { extern FunctionRNA rna_KeyingSetInfo_poll_func; diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index d8389093593..4b563bf6659 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -399,7 +399,7 @@ static void rna_SplineIKConstraint_joint_bindings_set(PointerRNA *ptr, const flo memcpy(ikData->points, values, ikData->numpoints * sizeof(float)); } -static int rna_Constraint_cameraObject_poll(PointerRNA *ptr, PointerRNA value) +static bool rna_Constraint_cameraObject_poll(PointerRNA *ptr, PointerRNA value) { Object *ob = (Object *)value.data; @@ -446,7 +446,7 @@ static void rna_Constraint_followTrack_depthObject_set(PointerRNA *ptr, PointerR } } -static int rna_Constraint_followTrack_depthObject_poll(PointerRNA *ptr, PointerRNA value) +static bool rna_Constraint_followTrack_depthObject_poll(PointerRNA *ptr, PointerRNA value) { Object *ob = (Object *)value.data; diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 50abf00714b..3c4baa70c5f 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -393,7 +393,7 @@ static void rna_Curve_bevelObject_set(PointerRNA *ptr, PointerRNA value) } } -static int rna_Curve_otherObject_poll(PointerRNA *ptr, PointerRNA value) +static bool rna_Curve_otherObject_poll(PointerRNA *ptr, PointerRNA value) { Curve *cu = (Curve *)ptr->id.data; Object *ob = (Object *)value.data; diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index f0f7dc13d2d..fac0f39b11c 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -240,16 +240,16 @@ void rna_Mesh_update_draw(struct Main *bmain, struct Scene *scene, struct Pointe void rna_TextureSlot_update(struct Main *bmain, struct Scene *scene, struct PointerRNA *ptr); /* basic poll functions for object types */ -int rna_Armature_object_poll(struct PointerRNA *ptr, struct PointerRNA value); -int rna_Camera_object_poll(struct PointerRNA *ptr, struct PointerRNA value); -int rna_Curve_object_poll(struct PointerRNA *ptr, struct PointerRNA value); -int rna_Lamp_object_poll(struct PointerRNA *ptr, struct PointerRNA value); -int rna_Lattice_object_poll(struct PointerRNA *ptr, struct PointerRNA value); -int rna_Mesh_object_poll(struct PointerRNA *ptr, struct PointerRNA value); +bool rna_Armature_object_poll(struct PointerRNA *ptr, struct PointerRNA value); +bool rna_Camera_object_poll(struct PointerRNA *ptr, struct PointerRNA value); +bool rna_Curve_object_poll(struct PointerRNA *ptr, struct PointerRNA value); +bool rna_Lamp_object_poll(struct PointerRNA *ptr, struct PointerRNA value); +bool rna_Lattice_object_poll(struct PointerRNA *ptr, struct PointerRNA value); +bool rna_Mesh_object_poll(struct PointerRNA *ptr, struct PointerRNA value); /* basic poll functions for actions (to prevent actions getting set in wrong places) */ -int rna_Action_id_poll(struct PointerRNA *ptr, struct PointerRNA value); -int rna_Action_actedit_assign_poll(struct PointerRNA *ptr, struct PointerRNA value); +bool rna_Action_id_poll(struct PointerRNA *ptr, struct PointerRNA value); +bool rna_Action_actedit_assign_poll(struct PointerRNA *ptr, struct PointerRNA value); char *rna_TextureSlot_path(struct PointerRNA *ptr); char *rna_Node_ImageUser_path(struct PointerRNA *ptr); diff --git a/source/blender/makesrna/intern/rna_internal_types.h b/source/blender/makesrna/intern/rna_internal_types.h index 3e678b52050..f9929cec7b1 100644 --- a/source/blender/makesrna/intern/rna_internal_types.h +++ b/source/blender/makesrna/intern/rna_internal_types.h @@ -94,8 +94,8 @@ typedef const EnumPropertyItem *(*PropEnumItemFunc)( typedef PointerRNA (*PropPointerGetFunc)(struct PointerRNA *ptr); typedef StructRNA *(*PropPointerTypeFunc)(struct PointerRNA *ptr); typedef void (*PropPointerSetFunc)(struct PointerRNA *ptr, const PointerRNA value); -typedef int (*PropPointerPollFunc)(struct PointerRNA *ptr, const PointerRNA value); -typedef int (*PropPointerPollFuncPy)(struct PointerRNA *ptr, const PointerRNA value, const PropertyRNA *prop); +typedef bool (*PropPointerPollFunc)(struct PointerRNA *ptr, const PointerRNA value); +typedef bool (*PropPointerPollFuncPy)(struct PointerRNA *ptr, const PointerRNA value, const PropertyRNA *prop); typedef void (*PropCollectionBeginFunc)(struct CollectionPropertyIterator *iter, struct PointerRNA *ptr); typedef void (*PropCollectionNextFunc)(struct CollectionPropertyIterator *iter); typedef void (*PropCollectionEndFunc)(struct CollectionPropertyIterator *iter); diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c index a29f10684bb..27fd02c9be7 100644 --- a/source/blender/makesrna/intern/rna_modifier.c +++ b/source/blender/makesrna/intern/rna_modifier.c @@ -1155,7 +1155,7 @@ static void rna_MeshSequenceCache_object_path_update(Main *bmain, Scene *scene, rna_Modifier_update(bmain, scene, ptr); } -static int rna_ParticleInstanceModifier_particle_system_poll(PointerRNA *ptr, const PointerRNA value) +static bool rna_ParticleInstanceModifier_particle_system_poll(PointerRNA *ptr, const PointerRNA value) { ParticleInstanceModifierData *psmd = ptr->data; ParticleSystem *psys = value.data; @@ -1164,7 +1164,7 @@ static int rna_ParticleInstanceModifier_particle_system_poll(PointerRNA *ptr, co return false; /* make sure psys is in the object */ - return BLI_findindex(&psmd->ob->particlesystem, psys) >= 0; + return BLI_findindex(&psmd->ob->particlesystem, psys) != -1; } static PointerRNA rna_ParticleInstanceModifier_particle_system_get(PointerRNA *ptr) diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 37f229a1402..38e969fedb5 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -244,7 +244,7 @@ bNodeTreeType *rna_node_tree_type_from_enum(int value) return result; } -const EnumPropertyItem *rna_node_tree_type_itemf(void *data, int (*poll)(void *data, bNodeTreeType *), bool *r_free) +const EnumPropertyItem *rna_node_tree_type_itemf(void *data, bool (*poll)(void *data, bNodeTreeType *), bool *r_free) { EnumPropertyItem tmp = {0}; EnumPropertyItem *item = NULL; @@ -320,7 +320,7 @@ bNodeType *rna_node_type_from_enum(int value) return result; } -const EnumPropertyItem *rna_node_type_itemf(void *data, int (*poll)(void *data, bNodeType *), bool *r_free) +const EnumPropertyItem *rna_node_type_itemf(void *data, bool (*poll)(void *data, bNodeType *), bool *r_free) { EnumPropertyItem *item = NULL; EnumPropertyItem tmp = {0}; @@ -395,7 +395,7 @@ bNodeSocketType *rna_node_socket_type_from_enum(int value) } const EnumPropertyItem *rna_node_socket_type_itemf( - void *data, int (*poll)(void *data, bNodeSocketType *), bool *r_free) + void *data, bool (*poll)(void *data, bNodeSocketType *), bool *r_free) { EnumPropertyItem *item = NULL; EnumPropertyItem tmp = {0}; @@ -527,7 +527,7 @@ static StructRNA *rna_NodeTree_refine(struct PointerRNA *ptr) return &RNA_NodeTree; } -static int rna_NodeTree_poll(const bContext *C, bNodeTreeType *ntreetype) +static bool rna_NodeTree_poll(const bContext *C, bNodeTreeType *ntreetype) { extern FunctionRNA rna_NodeTree_poll_func; @@ -1141,7 +1141,7 @@ char *rna_Node_ImageUser_path(PointerRNA *ptr) return NULL; } -static int rna_Node_poll(bNodeType *ntype, bNodeTree *ntree) +static bool rna_Node_poll(bNodeType *ntype, bNodeTree *ntree) { extern FunctionRNA rna_Node_poll_func; @@ -1149,7 +1149,7 @@ static int rna_Node_poll(bNodeType *ntype, bNodeTree *ntree) ParameterList list; FunctionRNA *func; void *ret; - int visible; + bool visible; RNA_pointer_create(NULL, ntype->ext.srna, NULL, &ptr); /* dummy */ func = &rna_Node_poll_func; /* RNA_struct_find_function(&ptr, "poll"); */ @@ -1166,7 +1166,7 @@ static int rna_Node_poll(bNodeType *ntype, bNodeTree *ntree) return visible; } -static int rna_Node_poll_instance(bNode *node, bNodeTree *ntree) +static bool rna_Node_poll_instance(bNode *node, bNodeTree *ntree) { extern FunctionRNA rna_Node_poll_instance_func; @@ -1174,7 +1174,7 @@ static int rna_Node_poll_instance(bNode *node, bNodeTree *ntree) ParameterList list; FunctionRNA *func; void *ret; - int visible; + bool visible; RNA_pointer_create(NULL, node->typeinfo->ext.srna, node, &ptr); /* dummy */ func = &rna_Node_poll_instance_func; /* RNA_struct_find_function(&ptr, "poll_instance"); */ @@ -1191,7 +1191,7 @@ static int rna_Node_poll_instance(bNode *node, bNodeTree *ntree) return visible; } -static int rna_Node_poll_instance_default(bNode *node, bNodeTree *ntree) +static bool rna_Node_poll_instance_default(bNode *node, bNodeTree *ntree) { /* use the basic poll function */ return rna_Node_poll(node->typeinfo, ntree); @@ -1557,7 +1557,7 @@ static void rna_Node_parent_set(PointerRNA *ptr, PointerRNA value) } } -static int rna_Node_parent_poll(PointerRNA *ptr, PointerRNA value) +static bool rna_Node_parent_poll(PointerRNA *ptr, PointerRNA value) { bNode *node = ptr->data; bNode *parent = value.data; @@ -2520,7 +2520,7 @@ static void rna_NodeGroup_node_tree_set(PointerRNA *ptr, const PointerRNA value) } } -static int rna_NodeGroup_node_tree_poll(PointerRNA *ptr, const PointerRNA value) +static bool rna_NodeGroup_node_tree_poll(PointerRNA *ptr, const PointerRNA value) { bNodeTree *ntree = ptr->id.data; bNodeTree *ngroup = value.data; diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index d0ae06bd048..9b741cf044a 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -1477,32 +1477,32 @@ static float rna_VertexGroup_weight(ID *id, bDeformGroup *dg, ReportList *report } /* generic poll functions */ -int rna_Lattice_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) +bool rna_Lattice_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) { return ((Object *)value.id.data)->type == OB_LATTICE; } -int rna_Curve_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) +bool rna_Curve_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) { return ((Object *)value.id.data)->type == OB_CURVE; } -int rna_Armature_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) +bool rna_Armature_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) { return ((Object *)value.id.data)->type == OB_ARMATURE; } -int rna_Mesh_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) +bool rna_Mesh_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) { return ((Object *)value.id.data)->type == OB_MESH; } -int rna_Camera_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) +bool rna_Camera_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) { return ((Object *)value.id.data)->type == OB_CAMERA; } -int rna_Lamp_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) +bool rna_Lamp_object_poll(PointerRNA *UNUSED(ptr), PointerRNA value) { return ((Object *)value.id.data)->type == OB_LAMP; } diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c index 882a1989672..890aa532943 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.c +++ b/source/blender/makesrna/intern/rna_sculpt_paint.c @@ -244,7 +244,7 @@ static char *rna_ParticleEdit_path(PointerRNA *UNUSED(ptr)) return BLI_strdup("tool_settings.particle_edit"); } -static int rna_Brush_mode_poll(PointerRNA *ptr, PointerRNA value) +static bool rna_Brush_mode_poll(PointerRNA *ptr, PointerRNA value) { Scene *scene = (Scene *)ptr->id.data; ToolSettings *ts = scene->toolsettings; diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index fb6953904b3..aa3ab1742aa 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -1046,7 +1046,7 @@ static void rna_SequenceModifier_update(Main *UNUSED(bmain), Scene *UNUSED(scene BKE_sequence_invalidate_cache_for_modifier(scene, seq); } -static int rna_SequenceModifier_otherSequence_poll(PointerRNA *ptr, PointerRNA value) +static bool rna_SequenceModifier_otherSequence_poll(PointerRNA *ptr, PointerRNA value) { Scene *scene = (Scene *) ptr->id.data; Editing *ed = BKE_sequencer_editing_get(scene, false); diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 93ae2f29f82..23ed021b190 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1479,7 +1479,7 @@ static void rna_SpaceNodeEditor_node_tree_set(PointerRNA *ptr, const PointerRNA ED_node_tree_start(snode, (bNodeTree *)value.data, NULL, NULL); } -static int rna_SpaceNodeEditor_node_tree_poll(PointerRNA *ptr, const PointerRNA value) +static bool rna_SpaceNodeEditor_node_tree_poll(PointerRNA *ptr, const PointerRNA value) { SpaceNode *snode = (SpaceNode *)ptr->data; bNodeTree *ntree = (bNodeTree *)value.data; @@ -1503,7 +1503,7 @@ static void rna_SpaceNodeEditor_tree_type_set(PointerRNA *ptr, int value) SpaceNode *snode = (SpaceNode *)ptr->data; ED_node_set_tree_type(snode, rna_node_tree_type_from_enum(value)); } -static int rna_SpaceNodeEditor_tree_type_poll(void *Cv, bNodeTreeType *type) +static bool rna_SpaceNodeEditor_tree_type_poll(void *Cv, bNodeTreeType *type) { bContext *C = (bContext *)Cv; if (type->poll) diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c index 23d24ebaf82..840fe86ea04 100644 --- a/source/blender/makesrna/intern/rna_ui.c +++ b/source/blender/makesrna/intern/rna_ui.c @@ -105,7 +105,7 @@ static ARegionType *region_type_find(ReportList *reports, int space_type, int re /* Panel */ -static int panel_poll(const bContext *C, PanelType *pt) +static bool panel_poll(const bContext *C, PanelType *pt) { extern FunctionRNA rna_Panel_poll_func; @@ -643,7 +643,7 @@ static StructRNA *rna_Header_refine(PointerRNA *htr) /* Menu */ -static int menu_poll(const bContext *C, MenuType *pt) +static bool menu_poll(const bContext *C, MenuType *pt) { extern FunctionRNA rna_Menu_poll_func; @@ -651,7 +651,7 @@ static int menu_poll(const bContext *C, MenuType *pt) ParameterList list; FunctionRNA *func; void *ret; - int visible; + bool visible; RNA_pointer_create(NULL, pt->ext.srna, NULL, &ptr); /* dummy */ func = &rna_Menu_poll_func; /* RNA_struct_find_function(&ptr, "poll"); */ diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c index 0de69b9729b..44e01cf8d44 100644 --- a/source/blender/makesrna/intern/rna_wm.c +++ b/source/blender/makesrna/intern/rna_wm.c @@ -640,7 +640,7 @@ static void rna_Window_screen_set(PointerRNA *ptr, PointerRNA value) win->newscreen = value.data; } -static int rna_Window_screen_assign_poll(PointerRNA *UNUSED(ptr), PointerRNA value) +static bool rna_Window_screen_assign_poll(PointerRNA *UNUSED(ptr), PointerRNA value) { bScreen *screen = (bScreen *)value.id.data; @@ -943,7 +943,7 @@ static void rna_wmClipboard_set(PointerRNA *UNUSED(ptr), const char *value) #ifdef WITH_PYTHON -static int rna_operator_poll_cb(bContext *C, wmOperatorType *ot) +static bool rna_operator_poll_cb(bContext *C, wmOperatorType *ot) { extern FunctionRNA rna_Operator_poll_func; |