griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

RNA: use boolean for function callbacks & "valid" iterator state

Browse Source 
Integers were used when the value is logically a boolean.

Ref !120130
This commit is contained in:
Campbell Barton
2024-04-15 21:53:27 +10:00
parent 1dede89eee
commit 904d51d6cb
25 changed files with 144 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1667,7 +1667,7 @@ static bool jump_to_target_button(bContext *C, bool poll)
char *str_ptr = RNA_property_string_get_alloc(
&ptr, prop, str_buf, sizeof(str_buf), nullptr);
int found = 0;
bool found = false;
/* Jump to target only works with search properties currently, not search callbacks yet.
* See ui_but_add_search. */
if (coll_search->search_prop != nullptr) {

26
source/blender/makesrna/RNA_access.hh
View File

@@ -472,15 +472,15 @@ bool RNA_property_collection_is_empty(PointerRNA *ptr, PropertyRNA *prop);
int RNA_property_collection_lookup_index(PointerRNA *ptr,
PropertyRNA *prop,
const PointerRNA *t_ptr);
int RNA_property_collection_lookup_int(PointerRNA *ptr,
PropertyRNA *prop,
int key,
PointerRNA *r_ptr);
int RNA_property_collection_lookup_string(PointerRNA *ptr,
PropertyRNA *prop,
const char *key,
PointerRNA *r_ptr);
int RNA_property_collection_lookup_string_index(
bool RNA_property_collection_lookup_int(PointerRNA *ptr,
PropertyRNA *prop,
int key,
PointerRNA *r_ptr);
bool RNA_property_collection_lookup_string(PointerRNA *ptr,
PropertyRNA *prop,
const char *key,
PointerRNA *r_ptr);
bool RNA_property_collection_lookup_string_index(
PointerRNA *ptr, PropertyRNA *prop, const char *key, PointerRNA *r_ptr, int *r_index);
bool RNA_property_collection_lookup_int_has_fn(PropertyRNA *prop);
@@ -495,10 +495,10 @@ bool RNA_property_collection_lookup_string_supported(PropertyRNA *prop);
/**
* Zero return is an assignment error.
*/
int RNA_property_collection_assign_int(PointerRNA *ptr,
PropertyRNA *prop,
int key,
const PointerRNA *assign_ptr);
bool RNA_property_collection_assign_int(PointerRNA *ptr,
PropertyRNA *prop,
int key,
const PointerRNA *assign_ptr);
bool RNA_property_collection_type_get(PointerRNA *ptr, PropertyRNA *prop, PointerRNA *r_ptr);
/* efficient functions to set properties for arrays */

6
source/blender/makesrna/RNA_types.hh
View File

@@ -388,7 +388,7 @@ ENUM_OPERATORS(ParameterFlag, PARM_PYFUNC_OPTIONAL)
struct CollectionPropertyIterator;
struct Link;
using IteratorSkipFunc = int (*)(CollectionPropertyIterator *iter, void *data);
using IteratorSkipFunc = bool (*)(CollectionPropertyIterator *iter, void *data);
struct ListBaseIterator {
Link *link;
@@ -439,7 +439,7 @@ struct CollectionPropertyIterator {
/* external */
PointerRNA ptr;
int valid;
bool valid;
};
struct CollectionVector {
@@ -610,7 +610,7 @@ struct ParameterIterator {
int size, offset;
PropertyRNA *parm;
int valid;
bool valid;
};
/** Mainly to avoid confusing casts. */

35
source/blender/makesrna/intern/makesrna.cc
View File

@@ -1696,7 +1696,7 @@ static char *rna_def_property_lookup_int_func(FILE *f,
func = rna_alloc_function_name(srna->identifier, rna_safe_id(prop->identifier), "lookup_int");
fprintf(f, "RNA_EXTERN_C int %s(PointerRNA *ptr, int index, PointerRNA *r_ptr)\n", func);
fprintf(f, "RNA_EXTERN_C bool %s(PointerRNA *ptr, int index, PointerRNA *r_ptr)\n", func);
fprintf(f, "{\n");
if (manualfunc) {
@@ -1706,7 +1706,7 @@ static char *rna_def_property_lookup_int_func(FILE *f,
return func;
}
fprintf(f, " int found = 0;\n");
fprintf(f, " bool found = false;\n");
fprintf(f, " CollectionPropertyIterator iter;\n\n");
fprintf(f, " %s_%s_begin(&iter, ptr);\n\n", srna->identifier, rna_safe_id(prop->identifier));
@@ -1855,7 +1855,7 @@ static char *rna_def_property_lookup_string_func(FILE *f,
rna_safe_id(item_name_prop->identifier));
}
fprintf(f, "RNA_EXTERN_C int %s(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)\n", func);
fprintf(f, "RNA_EXTERN_C bool %s(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)\n", func);
fprintf(f, "{\n");
if (manualfunc) {
@@ -2428,11 +2428,11 @@ static void rna_def_property_funcs_header(FILE *f, StructRNA *srna, PropertyDefR
fprintf(f, "int %slength(PointerRNA *ptr);\n", func);
}
if (cprop->lookupint) {
fprintf(f, "int %slookup_int(PointerRNA *ptr, int key, PointerRNA *r_ptr);\n", func);
fprintf(f, "bool %slookup_int(PointerRNA *ptr, int key, PointerRNA *r_ptr);\n", func);
}
if (cprop->lookupstring) {
fprintf(f,
"int %slookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr);\n",
"bool %slookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr);\n",
func);
}
break;
@@ -5149,16 +5149,17 @@ static const char *cpp_classes =
" { return sname##_##identifier##_length(ptr) == 0; } \n"
"\n"
"#define COLLECTION_PROPERTY_LOOKUP_INT_false(sname, identifier) \\\n"
" inline static int sname##_##identifier##_lookup_int_wrap(PointerRNA *ptr, int key, "
" inline static bool sname##_##identifier##_lookup_int_wrap(PointerRNA *ptr, int key, "
"PointerRNA *r_ptr) \\\n"
" { \\\n"
" CollectionPropertyIterator iter; \\\n"
" int i = 0, found = 0; \\\n"
" int i = 0; \\\n"
" bool found = false; \\\n"
" sname##_##identifier##_begin(&iter, ptr); \\\n"
" while (iter.valid) { \\\n"
" if (i == key) { \\\n"
" *r_ptr = iter.ptr; \\\n"
" found = 1; \\\n"
" found = true; \\\n"
" break; \\\n"
" } \\\n"
" sname##_##identifier##_next(&iter); \\\n"
@@ -5171,21 +5172,21 @@ static const char *cpp_classes =
" return found; \\\n"
" } \n"
"#define COLLECTION_PROPERTY_LOOKUP_INT_true(sname, identifier) \\\n"
" inline static int sname##_##identifier##_lookup_int_wrap(PointerRNA *ptr, int key, "
" inline static bool sname##_##identifier##_lookup_int_wrap(PointerRNA *ptr, int key, "
"PointerRNA *r_ptr) \\\n"
" { \\\n"
" int found = sname##_##identifier##_lookup_int(ptr, key, r_ptr); \\\n"
" bool found = sname##_##identifier##_lookup_int(ptr, key, r_ptr); \\\n"
" if (!found) { \\\n"
" memset(r_ptr, 0, sizeof(*r_ptr)); \\\n"
" } \\\n"
" return found; \\\n"
" } \n"
"#define COLLECTION_PROPERTY_LOOKUP_STRING_false(sname, identifier) \\\n"
" inline static int sname##_##identifier##_lookup_string_wrap(PointerRNA *ptr, const char "
" inline static bool sname##_##identifier##_lookup_string_wrap(PointerRNA *ptr, const char "
"*key, PointerRNA *r_ptr) \\\n"
" { \\\n"
" CollectionPropertyIterator iter; \\\n"
" int found = 0; \\\n"
" bool found = false; \\\n"
" PropertyRNA *item_name_prop = RNA_struct_name_property(ptr->type); \\\n"
" sname##_##identifier##_begin(&iter, ptr); \\\n"
" while (iter.valid && !found) { \\\n"
@@ -5196,7 +5197,7 @@ static const char *cpp_classes =
"sizeof(name_fixed), &name_length); \\\n"
" if (!strncmp(name, key, name_length)) { \\\n"
" *r_ptr = iter.ptr; \\\n"
" found = 1; \\\n"
" found = true; \\\n"
" } \\\n"
" if (name_fixed != name) { \\\n"
" MEM_freeN((void *) name); \\\n"
@@ -5210,10 +5211,10 @@ static const char *cpp_classes =
" return found; \\\n"
" } \n"
"#define COLLECTION_PROPERTY_LOOKUP_STRING_true(sname, identifier) \\\n"
" inline static int sname##_##identifier##_lookup_string_wrap(PointerRNA *ptr, const char "
" inline static bool sname##_##identifier##_lookup_string_wrap(PointerRNA *ptr, const char "
"*key, PointerRNA *r_ptr) \\\n"
" { \\\n"
" int found = sname##_##identifier##_lookup_string(ptr, key, r_ptr); \\\n"
" bool found = sname##_##identifier##_lookup_string(ptr, key, r_ptr); \\\n"
" if (!found) { \\\n"
" memset(r_ptr, 0, sizeof(*r_ptr)); \\\n"
" } \\\n"
@@ -5298,8 +5299,8 @@ static const char *cpp_classes =
"typedef void (*TEndFunc)(CollectionPropertyIterator *iter);\n"
"typedef int (*TLengthFunc)(PointerRNA *ptr);\n"
"typedef bool (*TEmptyFunc)(PointerRNA *ptr);\n"
"typedef int (*TLookupIntFunc)(PointerRNA *ptr, int key, PointerRNA *r_ptr);\n"
"typedef int (*TLookupStringFunc)(PointerRNA *ptr, const char *key, PointerRNA *r_ptr);\n"
"typedef bool (*TLookupIntFunc)(PointerRNA *ptr, int key, PointerRNA *r_ptr);\n"
"typedef bool (*TLookupStringFunc)(PointerRNA *ptr, const char *key, PointerRNA *r_ptr);\n"
"\n"
"template<typename T, TBeginFunc Tbegin, TNextFunc Tnext, TEndFunc Tend>\n"
"class CollectionIterator {\n"

6
source/blender/makesrna/intern/rna_ID.cc
View File

@@ -1162,7 +1162,7 @@ static int rna_IDPArray_length(PointerRNA *ptr)
return prop->len;
}
int rna_IDMaterials_assign_int(PointerRNA *ptr, int key, const PointerRNA *assign_ptr)
bool rna_IDMaterials_assign_int(PointerRNA *ptr, int key, const PointerRNA *assign_ptr)
{
ID *id = ptr->owner_id;
short *totcol = BKE_id_material_len_p(id);
@@ -1171,10 +1171,10 @@ int rna_IDMaterials_assign_int(PointerRNA *ptr, int key, const PointerRNA *assig
BLI_assert(BKE_id_is_in_global_main(id));
BLI_assert(BKE_id_is_in_global_main(&mat_id->id));
BKE_id_material_assign(G_MAIN, id, mat_id, key + 1);
return 1;
return true;
}
else {
return 0;
return false;
}
}

32
source/blender/makesrna/intern/rna_access.cc
View File

@@ -4390,10 +4390,10 @@ bool RNA_property_collection_lookup_string_supported(PropertyRNA *prop)
RNA_property_collection_lookup_string_has_nameprop(prop));
}
int RNA_property_collection_lookup_int(PointerRNA *ptr,
PropertyRNA *prop,
int key,
PointerRNA *r_ptr)
bool RNA_property_collection_lookup_int(PointerRNA *ptr,
PropertyRNA *prop,
int key,
PointerRNA *r_ptr)
{
CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)rna_ensure_property(prop);
@@ -4423,7 +4423,7 @@ int RNA_property_collection_lookup_int(PointerRNA *ptr,
return iter.valid;
}
int RNA_property_collection_lookup_string_index(
bool RNA_property_collection_lookup_string_index(
PointerRNA *ptr, PropertyRNA *prop, const char *key, PointerRNA *r_ptr, int *r_index)
{
CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)rna_ensure_property(prop);
@@ -4444,7 +4444,7 @@ int RNA_property_collection_lookup_string_index(
CollectionPropertyIterator iter;
PropertyRNA *nameprop;
char name[256], *nameptr;
int found = 0;
bool found = false;
int keylen = strlen(key);
int namelen;
int index = 0;
@@ -4458,7 +4458,7 @@ int RNA_property_collection_lookup_string_index(
if ((keylen == namelen) && STREQ(nameptr, key)) {
*r_ptr = iter.ptr;
found = 1;
found = true;
}
if (name != nameptr) {
@@ -4483,19 +4483,19 @@ int RNA_property_collection_lookup_string_index(
return iter.valid;
}
int RNA_property_collection_lookup_string(PointerRNA *ptr,
PropertyRNA *prop,
const char *key,
PointerRNA *r_ptr)
bool RNA_property_collection_lookup_string(PointerRNA *ptr,
PropertyRNA *prop,
const char *key,
PointerRNA *r_ptr)
{
int index;
return RNA_property_collection_lookup_string_index(ptr, prop, key, r_ptr, &index);
}
int RNA_property_collection_assign_int(PointerRNA *ptr,
PropertyRNA *prop,
const int key,
const PointerRNA *assign_ptr)
bool RNA_property_collection_assign_int(PointerRNA *ptr,
PropertyRNA *prop,
const int key,
const PointerRNA *assign_ptr)
{
CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)rna_ensure_property(prop);
@@ -4506,7 +4506,7 @@ int RNA_property_collection_assign_int(PointerRNA *ptr,
return cprop->assignint(ptr, key, assign_ptr);
}
return 0;
return false;
}
bool RNA_property_collection_type_get(PointerRNA *ptr, PropertyRNA *prop, PointerRNA *r_ptr)

4
source/blender/makesrna/intern/rna_access_compare_override.cc
View File

@@ -1084,10 +1084,10 @@ static bool rna_property_override_collection_subitem_name_id_lookup(
memset(r_ptr_item_name, 0, sizeof(*r_ptr_item_name));
}
return bool(iter.valid);
return iter.valid;
}
else {
return bool(RNA_property_collection_lookup_string(ptr, prop, item_name, r_ptr_item_name));
return RNA_property_collection_lookup_string(ptr, prop, item_name, r_ptr_item_name);
}
}

2
source/blender/makesrna/intern/rna_armature.cc
View File

@@ -1060,7 +1060,7 @@ static void rna_Armature_bones_next(CollectionPropertyIterator *iter)
}
/* not essential, but much faster than the default lookup function */
static int rna_Armature_bones_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)
static bool rna_Armature_bones_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)
{
bArmature *arm = (bArmature *)ptr->data;
Bone *bone = BKE_armature_find_bone_name(arm, key);

9
source/blender/makesrna/intern/rna_attribute.cc
View File

@@ -434,13 +434,13 @@ static void rna_AttributeGroup_remove(ID *id, ReportList *reports, PointerRNA *a
WM_main_add_notifier(NC_GEOM | ND_DATA, id);
}
static int rna_Attributes_layer_skip(CollectionPropertyIterator * /*iter*/, void *data)
static bool rna_Attributes_layer_skip(CollectionPropertyIterator * /*iter*/, void *data)
{
CustomDataLayer *layer = (CustomDataLayer *)data;
return !(CD_TYPE_AS_MASK(layer->type) & CD_MASK_PROP_ALL);
}
static int rna_Attributes_noncolor_layer_skip(CollectionPropertyIterator *iter, void *data)
static bool rna_Attributes_noncolor_layer_skip(CollectionPropertyIterator *iter, void *data)
{
CustomDataLayer *layer = (CustomDataLayer *)data;
@@ -448,7 +448,7 @@ static int rna_Attributes_noncolor_layer_skip(CollectionPropertyIterator *iter,
ID *id = iter->parent.owner_id;
const AttrDomain domain = BKE_id_attribute_domain(id, layer);
if (!(ATTR_DOMAIN_AS_MASK(domain) & ATTR_DOMAIN_MASK_COLOR)) {
return 1;
return true;
}
return !(CD_TYPE_AS_MASK(layer->type) & CD_MASK_COLOR_ALL) || (layer->flag & CD_FLAG_TEMPORARY);
@@ -458,7 +458,8 @@ static int rna_Attributes_noncolor_layer_skip(CollectionPropertyIterator *iter,
* array iterators to loop over all. */
static void rna_AttributeGroup_next_domain(ID *id,
CollectionPropertyIterator *iter,
int(skip)(CollectionPropertyIterator *iter, void *data))
bool(skip)(CollectionPropertyIterator *iter,
void *data))
{
do {
CustomDataLayer *prev_layers = (iter->internal.array.endptr == nullptr) ?

8
source/blender/makesrna/intern/rna_curves.cc
View File

@@ -109,7 +109,7 @@ static void rna_Curves_curve_offset_data_begin(CollectionPropertyIterator *iter,
nullptr);
}
static int rna_Curves_curve_offset_data_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
static bool rna_Curves_curve_offset_data_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
Curves *curves = rna_curves(ptr);
if (index < 0 || index >= curves->geometry.curve_num + 1) {
@@ -156,7 +156,7 @@ static int rna_Curves_curves_length(PointerRNA *ptr)
return curves->geometry.curve_num;
}
static int rna_Curves_curves_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
static bool rna_Curves_curves_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
Curves *curves = rna_curves(ptr);
if (index < 0 || index >= curves->geometry.curve_num) {
@@ -174,7 +174,7 @@ static int rna_Curves_position_data_length(PointerRNA *ptr)
return curves->geometry.point_num;
}
int rna_Curves_position_data_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
bool rna_Curves_position_data_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
Curves *curves = rna_curves(ptr);
if (index < 0 || index >= curves->geometry.point_num) {
@@ -240,7 +240,7 @@ static std::optional<std::string> rna_CurvePoint_path(const PointerRNA *ptr)
return fmt::format("points[{}]", rna_CurvePoint_index_get_const(ptr));
}
int rna_Curves_points_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
bool rna_Curves_points_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
Curves *curves = rna_curves(ptr);
if (index < 0 || index >= curves->geometry.point_num) {

4
source/blender/makesrna/intern/rna_internal.hh
View File

@@ -558,7 +558,7 @@ void rna_builtin_properties_begin(CollectionPropertyIterator *iter, PointerRNA *
void rna_builtin_properties_next(CollectionPropertyIterator *iter);
PointerRNA rna_builtin_properties_get(CollectionPropertyIterator *iter);
PointerRNA rna_builtin_type_get(PointerRNA *ptr);
int rna_builtin_properties_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr);
bool rna_builtin_properties_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr);
/* Iterators */
@@ -614,7 +614,7 @@ MTex *rna_mtex_texture_slots_add(ID *self, bContext *C, ReportList *reports);
MTex *rna_mtex_texture_slots_create(ID *self, bContext *C, ReportList *reports, int index);
void rna_mtex_texture_slots_clear(ID *self, bContext *C, ReportList *reports, int index);
int rna_IDMaterials_assign_int(PointerRNA *ptr, int key, const PointerRNA *assign_ptr);
bool rna_IDMaterials_assign_int(PointerRNA *ptr, int key, const PointerRNA *assign_ptr);
const char *rna_translate_ui_text(
const char *text, const char *text_ctxt, StructRNA *type, PropertyRNA *prop, bool translate);

14
source/blender/makesrna/intern/rna_internal_types.hh
View File

@@ -91,13 +91,13 @@ using PropCollectionNextFunc = void (*)(CollectionPropertyIterator *iter);
using PropCollectionEndFunc = void (*)(CollectionPropertyIterator *iter);
using PropCollectionGetFunc = PointerRNA (*)(CollectionPropertyIterator *iter);
using PropCollectionLengthFunc = int (*)(PointerRNA *ptr);
using PropCollectionLookupIntFunc = int (*)(PointerRNA *ptr, int key, PointerRNA *r_ptr);
using PropCollectionLookupStringFunc = int (*)(PointerRNA *ptr,
const char *key,
PointerRNA *r_ptr);
using PropCollectionAssignIntFunc = int (*)(PointerRNA *ptr,
int key,
const PointerRNA *assign_ptr);
using PropCollectionLookupIntFunc = bool (*)(PointerRNA *ptr, int key, PointerRNA *r_ptr);
using PropCollectionLookupStringFunc = bool (*)(PointerRNA *ptr,
const char *key,
PointerRNA *r_ptr);
using PropCollectionAssignIntFunc = bool (*)(PointerRNA *ptr,
int key,
const PointerRNA *assign_ptr);
/* extended versions with PropertyRNA argument */
using PropBooleanGetFuncEx = bool (*)(PointerRNA *ptr, PropertyRNA *prop);

4
source/blender/makesrna/intern/rna_key.cc
View File

@@ -635,7 +635,7 @@ static PointerRNA rna_ShapeKey_data_get(CollectionPropertyIterator *iter)
return rna_pointer_inherit_refine(&iter->parent, type, ptr);
}
int rna_ShapeKey_data_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
bool rna_ShapeKey_data_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
Key *key = rna_ShapeKey_find_key(ptr->owner_id);
KeyBlock *kb = (KeyBlock *)ptr->data;
@@ -696,7 +696,7 @@ static int rna_ShapeKey_points_length(PointerRNA *ptr)
return tot;
}
int rna_ShapeKey_points_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
bool rna_ShapeKey_points_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
Key *key = rna_ShapeKey_find_key(ptr->owner_id);
KeyBlock *kb = (KeyBlock *)ptr->data;

14
source/blender/makesrna/intern/rna_layer.cc
View File

@@ -176,16 +176,16 @@ static PointerRNA rna_ViewLayer_objects_get(CollectionPropertyIterator *iter)
return rna_pointer_inherit_refine(&iter->parent, &RNA_Object, base->object);
}
static int rna_ViewLayer_objects_selected_skip(CollectionPropertyIterator *iter, void * /*data*/)
static bool rna_ViewLayer_objects_selected_skip(CollectionPropertyIterator *iter, void * /*data*/)
{
ListBaseIterator *internal = &iter->internal.listbase;
Base *base = (Base *)internal->link;
if ((base->flag & BASE_SELECTED) != 0) {
return 0;
return false;
}
return 1;
return true;
};
static PointerRNA rna_ViewLayer_depsgraph_get(PointerRNA *ptr)
@@ -386,7 +386,7 @@ void rna_LayerCollection_children_begin(CollectionPropertyIterator *iter, Pointe
rna_iterator_listbase_begin(iter, &lc->layer_collections, nullptr);
}
static int rna_LayerCollection_children_lookupint(PointerRNA *ptr, int key, PointerRNA *r_ptr)
static bool rna_LayerCollection_children_lookupint(PointerRNA *ptr, int key, PointerRNA *r_ptr)
{
Scene *scene = (Scene *)ptr->owner_id;
LayerCollection *lc = (LayerCollection *)ptr->data;
@@ -402,9 +402,9 @@ static int rna_LayerCollection_children_lookupint(PointerRNA *ptr, int key, Poin
return true;
}
static int rna_LayerCollection_children_lookupstring(PointerRNA *ptr,
const char *key,
PointerRNA *r_ptr)
static bool rna_LayerCollection_children_lookupstring(PointerRNA *ptr,
const char *key,
PointerRNA *r_ptr)
{
Scene *scene = (Scene *)ptr->owner_id;
LayerCollection *lc = (LayerCollection *)ptr->data;

42
source/blender/makesrna/intern/rna_mesh.cc
View File

@@ -357,7 +357,7 @@ static int rna_Mesh_loop_triangles_length(PointerRNA *ptr)
return BKE_mesh_runtime_corner_tris_len(mesh);
}
int rna_Mesh_loop_triangles_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
bool rna_Mesh_loop_triangles_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
const Mesh *mesh = rna_mesh(ptr);
if (index < 0 || index >= BKE_mesh_runtime_corner_tris_len(mesh)) {
@@ -382,7 +382,7 @@ static void rna_Mesh_loop_triangle_polygons_begin(CollectionPropertyIterator *it
nullptr);
}
int rna_Mesh_loop_triangle_polygons_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
bool rna_Mesh_loop_triangle_polygons_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
const Mesh *mesh = rna_mesh(ptr);
if (index < 0 || index >= BKE_mesh_runtime_corner_tris_len(mesh)) {
@@ -986,10 +986,10 @@ static void bool_layer_begin(CollectionPropertyIterator *iter,
nullptr);
}
static int bool_layer_lookup_int(PointerRNA *ptr,
int index,
PointerRNA *r_ptr,
const char *(*layername_func)(const char *uv_name, char *name))
static bool bool_layer_lookup_int(PointerRNA *ptr,
int index,
PointerRNA *r_ptr,
const char *(*layername_func)(const char *uv_name, char *name))
{
char bool_layer_name[MAX_CUSTOMDATA_LAYER_NAME];
Mesh *mesh = rna_mesh(ptr);
@@ -1012,9 +1012,9 @@ static void rna_MeshUVLoopLayer_vert_select_begin(CollectionPropertyIterator *it
bool_layer_begin(iter, ptr, BKE_uv_map_vert_select_name_get);
}
static int rna_MeshUVLoopLayer_vert_select_lookup_int(PointerRNA *ptr,
int index,
PointerRNA *r_ptr)
static bool rna_MeshUVLoopLayer_vert_select_lookup_int(PointerRNA *ptr,
int index,
PointerRNA *r_ptr)
{
return bool_layer_lookup_int(ptr, index, r_ptr, BKE_uv_map_vert_select_name_get);
}
@@ -1026,9 +1026,9 @@ static void rna_MeshUVLoopLayer_edge_select_begin(CollectionPropertyIterator *it
bool_layer_begin(iter, ptr, BKE_uv_map_edge_select_name_get);
}
static int rna_MeshUVLoopLayer_edge_select_lookup_int(PointerRNA *ptr,
int index,
PointerRNA *r_ptr)
static bool rna_MeshUVLoopLayer_edge_select_lookup_int(PointerRNA *ptr,
int index,
PointerRNA *r_ptr)
{
return bool_layer_lookup_int(ptr, index, r_ptr, BKE_uv_map_edge_select_name_get);
}
@@ -1039,7 +1039,7 @@ static void rna_MeshUVLoopLayer_pin_begin(CollectionPropertyIterator *iter, Poin
bool_layer_begin(iter, ptr, BKE_uv_map_pin_name_get);
}
static int rna_MeshUVLoopLayer_pin_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
static bool rna_MeshUVLoopLayer_pin_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
return bool_layer_lookup_int(ptr, index, r_ptr, BKE_uv_map_pin_name_get);
}
@@ -1057,7 +1057,7 @@ static void rna_MeshUVLoopLayer_uv_begin(CollectionPropertyIterator *iter, Point
nullptr);
}
int rna_MeshUVLoopLayer_uv_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
bool rna_MeshUVLoopLayer_uv_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
Mesh *mesh = rna_mesh(ptr);
if (mesh->runtime->edit_mesh || index < 0 || index >= mesh->corners_num) {
@@ -1535,7 +1535,7 @@ static int rna_Mesh_vertices_length(PointerRNA *ptr)
const Mesh *mesh = rna_mesh(ptr);
return mesh->verts_num;
}
int rna_Mesh_vertices_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
bool rna_Mesh_vertices_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
Mesh *mesh = rna_mesh(ptr);
if (index < 0 || index >= mesh->verts_num) {
@@ -1560,7 +1560,7 @@ static int rna_Mesh_edges_length(PointerRNA *ptr)
const Mesh *mesh = rna_mesh(ptr);
return mesh->edges_num;
}
int rna_Mesh_edges_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
bool rna_Mesh_edges_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
using namespace blender;
Mesh *mesh = rna_mesh(ptr);
@@ -1586,7 +1586,7 @@ static int rna_Mesh_polygons_length(PointerRNA *ptr)
const Mesh *mesh = rna_mesh(ptr);
return mesh->faces_num;
}
int rna_Mesh_polygons_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
bool rna_Mesh_polygons_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
Mesh *mesh = rna_mesh(ptr);
if (index < 0 || index >= mesh->faces_num) {
@@ -1609,7 +1609,7 @@ static int rna_Mesh_loops_length(PointerRNA *ptr)
const Mesh *mesh = rna_mesh(ptr);
return mesh->corners_num;
}
int rna_Mesh_loops_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
bool rna_Mesh_loops_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
Mesh *mesh = rna_mesh(ptr);
if (index < 0 || index >= mesh->corners_num) {
@@ -1644,7 +1644,7 @@ static int rna_Mesh_vertex_normals_length(PointerRNA *ptr)
return mesh->verts_num;
}
int rna_Mesh_vertex_normals_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
bool rna_Mesh_vertex_normals_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
const Mesh *mesh = rna_mesh(ptr);
if (index < 0 || index >= mesh->verts_num) {
@@ -1675,7 +1675,7 @@ static int rna_Mesh_poly_normals_length(PointerRNA *ptr)
return mesh->faces_num;
}
int rna_Mesh_poly_normals_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
bool rna_Mesh_poly_normals_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
const Mesh *mesh = rna_mesh(ptr);
if (index < 0 || index >= mesh->faces_num) {
@@ -1706,7 +1706,7 @@ static int rna_Mesh_corner_normals_length(PointerRNA *ptr)
return mesh->corners_num;
}
int rna_Mesh_corner_normals_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
bool rna_Mesh_corner_normals_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
const Mesh *mesh = rna_mesh(ptr);
const blender::Span<blender::float3> normals = mesh->corner_normals();

4
source/blender/makesrna/intern/rna_mesh_utils.hh
View File

@@ -13,8 +13,8 @@
/* Define the accessors for a basic CustomDataLayer collection, skipping anonymous layers */
#define DEFINE_CUSTOMDATA_LAYER_COLLECTION(collection_name, customdata_type, layer_type) \
/* check */ \
[[maybe_unused]] static int rna_##collection_name##_check(CollectionPropertyIterator *, \
void *data) \
[[maybe_unused]] static bool rna_##collection_name##_check(CollectionPropertyIterator *, \
void *data) \
{ \
CustomDataLayer *layer = (CustomDataLayer *)data; \
return (layer->anonymous_id != NULL || layer->type != layer_type); \

12
source/blender/makesrna/intern/rna_node_tree_interface.cc
View File

@@ -823,11 +823,11 @@ static int rna_NodeTreeInterface_items_length(PointerRNA *ptr)
return ntree->interface_items().size();
}
static int rna_NodeTreeInterface_items_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
static bool rna_NodeTreeInterface_items_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
bNodeTree *ntree = reinterpret_cast<bNodeTree *>(ptr->owner_id);
if (!ntree->runtime) {
return 0;
return false;
}
ntree->ensure_interface_cache();
@@ -840,13 +840,13 @@ static int rna_NodeTreeInterface_items_lookup_int(PointerRNA *ptr, int index, Po
return true;
}
static int rna_NodeTreeInterface_items_lookup_string(PointerRNA *ptr,
const char *key,
PointerRNA *r_ptr)
static bool rna_NodeTreeInterface_items_lookup_string(PointerRNA *ptr,
const char *key,
PointerRNA *r_ptr)
{
bNodeTree *ntree = reinterpret_cast<bNodeTree *>(ptr->owner_id);
if (!ntree->runtime) {
return 0;
return false;
}
ntree->ensure_interface_cache();

4
source/blender/makesrna/intern/rna_nodetree.cc
View File

@@ -2112,7 +2112,7 @@ static bNodeSocket *find_socket_by_key(bNode &node,
return nullptr;
}
static int rna_NodeInputs_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)
static bool rna_NodeInputs_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)
{
bNode *node = static_cast<bNode *>(ptr->data);
if (bNodeSocket *socket = find_socket_by_key(*node, SOCK_IN, key)) {
@@ -2122,7 +2122,7 @@ static int rna_NodeInputs_lookup_string(PointerRNA *ptr, const char *key, Pointe
return false;
}
static int rna_NodeOutputs_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)
static bool rna_NodeOutputs_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)
{
bNode *node = static_cast<bNode *>(ptr->data);
if (bNodeSocket *socket = find_socket_by_key(*node, SOCK_OUT, key)) {

2
source/blender/makesrna/intern/rna_pointcloud.cc
View File

@@ -79,7 +79,7 @@ static void rna_PointCloud_points_begin(CollectionPropertyIterator *iter, Pointe
nullptr);
}
int rna_PointCloud_points_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
bool rna_PointCloud_points_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
PointCloud *pointcloud = rna_pointcloud(ptr);
if (index < 0 || index >= pointcloud->totpoint) {

2
source/blender/makesrna/intern/rna_pose.cc
View File

@@ -597,7 +597,7 @@ static int rna_PoseChannel_rotation_4d_editable(const PointerRNA *ptr, int index
}
/* not essential, but much faster than the default lookup function */
static int rna_PoseBones_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)
static bool rna_PoseBones_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)
{
bPose *pose = (bPose *)ptr->data;
bPoseChannel *pchan = BKE_pose_channel_find_name(pose, key);

28
source/blender/makesrna/intern/rna_rna.cc
View File

@@ -316,7 +316,7 @@ static PointerRNA rna_Struct_name_property_get(PointerRNA *ptr)
* iterate over properties of all inheritance levels, and for each struct to
* also iterator over id properties not known by RNA. */
static int rna_idproperty_known(CollectionPropertyIterator *iter, void *data)
static bool rna_idproperty_known(CollectionPropertyIterator *iter, void *data)
{
IDProperty *idprop = (IDProperty *)data;
PropertyRNA *prop;
@@ -330,30 +330,30 @@ static int rna_idproperty_known(CollectionPropertyIterator *iter, void *data)
if ((prop->flag_internal & PROP_INTERN_BUILTIN) == 0 &&
STREQ(prop->identifier, idprop->name))
{
return 1;
return true;
}
}
} while ((ptype = ptype->base));
return 0;
return false;
}
static int rna_property_builtin(CollectionPropertyIterator * /*iter*/, void *data)
static bool rna_property_builtin(CollectionPropertyIterator * /*iter*/, void *data)
{
PropertyRNA *prop = (PropertyRNA *)data;
/* function to skip builtin rna properties */
return (prop->flag_internal & PROP_INTERN_BUILTIN);
return (prop->flag_internal & PROP_INTERN_BUILTIN) != 0;
}
static int rna_function_builtin(CollectionPropertyIterator * /*iter*/, void *data)
static bool rna_function_builtin(CollectionPropertyIterator * /*iter*/, void *data)
{
FunctionRNA *func = (FunctionRNA *)data;
/* function to skip builtin rna functions */
return (func->flag & FUNC_BUILTIN);
return (func->flag & FUNC_BUILTIN) != 0;
}
static void rna_inheritance_next_level_restart(CollectionPropertyIterator *iter,
@@ -538,7 +538,7 @@ PointerRNA rna_builtin_properties_get(CollectionPropertyIterator *iter)
return rna_Struct_properties_get(iter);
}
int rna_builtin_properties_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)
bool rna_builtin_properties_lookup_string(PointerRNA *ptr, const char *key, PointerRNA *r_ptr)
{
StructRNA *srna;
PropertyRNA *prop;
@@ -1045,7 +1045,7 @@ static int rna_EnumProperty_default_get(PointerRNA *ptr)
return ((EnumPropertyRNA *)prop)->defaultvalue;
}
static int rna_enum_check_separator(CollectionPropertyIterator * /*iter*/, void *data)
static bool rna_enum_check_separator(CollectionPropertyIterator * /*iter*/, void *data)
{
EnumPropertyItem *item = (EnumPropertyItem *)data;
@@ -1218,7 +1218,7 @@ static bool rna_Function_use_self_type_get(PointerRNA *ptr)
/* Blender RNA */
static int rna_struct_is_publc(CollectionPropertyIterator * /*iter*/, void *data)
static bool rna_struct_is_publc(CollectionPropertyIterator * /*iter*/, void *data)
{
StructRNA *srna = static_cast<StructRNA *>(data);
@@ -1238,7 +1238,7 @@ static int rna_BlenderRNA_structs_length(PointerRNA *ptr)
BLI_assert(brna->structs_len == BLI_listbase_count(&brna->structs));
return brna->structs_len;
}
static int rna_BlenderRNA_structs_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
static bool rna_BlenderRNA_structs_lookup_int(PointerRNA *ptr, int index, PointerRNA *r_ptr)
{
BlenderRNA *brna = static_cast<BlenderRNA *>(ptr->data);
StructRNA *srna = static_cast<StructRNA *>(
@@ -1251,9 +1251,9 @@ static int rna_BlenderRNA_structs_lookup_int(PointerRNA *ptr, int index, Pointer
return false;
}
}
static int rna_BlenderRNA_structs_lookup_string(PointerRNA *ptr,
const char *key,
PointerRNA *r_ptr)
static bool rna_BlenderRNA_structs_lookup_string(PointerRNA *ptr,
const char *key,
PointerRNA *r_ptr)
{
BlenderRNA *brna = static_cast<BlenderRNA *>(ptr->data);
StructRNA *srna = static_cast<StructRNA *>(BLI_ghash_lookup(brna->structs_map, (void *)key));

6
source/blender/makesrna/intern/rna_scene.cc
View File

@@ -1221,16 +1221,16 @@ static std::optional<std::string> rna_SceneHydra_path(const PointerRNA * /*ptr*/
return "hydra";
}
static int rna_RenderSettings_stereoViews_skip(CollectionPropertyIterator *iter, void * /*data*/)
static bool rna_RenderSettings_stereoViews_skip(CollectionPropertyIterator *iter, void * /*data*/)
{
ListBaseIterator *internal = &iter->internal.listbase;
SceneRenderView *srv = (SceneRenderView *)internal->link;
if (STR_ELEM(srv->name, STEREO_LEFT_NAME, STEREO_RIGHT_NAME)) {
return 0;
return false;
}
return 1;
return true;
};
static void rna_RenderSettings_stereoViews_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)

6
source/blender/makesrna/intern/rna_sequencer.cc
View File

@@ -283,9 +283,9 @@ static void rna_SequenceEditor_sequences_all_end(CollectionPropertyIterator *ite
MEM_freeN(bli_iter);
}
static int rna_SequenceEditor_sequences_all_lookup_string(PointerRNA *ptr,
const char *key,
PointerRNA *r_ptr)
static bool rna_SequenceEditor_sequences_all_lookup_string(PointerRNA *ptr,
const char *key,
PointerRNA *r_ptr)
{
ID *id = ptr->owner_id;
Scene *scene = (Scene *)id;

12
source/blender/makesrna/intern/rna_tracking.cc
View File

@@ -418,26 +418,26 @@ static std::optional<std::string> rna_trackingStabilization_path(const PointerRN
return "tracking.stabilization";
}
static int rna_track_2d_stabilization(CollectionPropertyIterator * /*iter*/, void *data)
static bool rna_track_2d_stabilization(CollectionPropertyIterator * /*iter*/, void *data)
{
MovieTrackingTrack *track = (MovieTrackingTrack *)data;
if ((track->flag & TRACK_USE_2D_STAB) == 0) {
return 1;
return true;
}
return 0;
return false;
}
static int rna_track_2d_stabilization_rotation(CollectionPropertyIterator * /*iter*/, void *data)
static bool rna_track_2d_stabilization_rotation(CollectionPropertyIterator * /*iter*/, void *data)
{
MovieTrackingTrack *track = (MovieTrackingTrack *)data;
if ((track->flag & TRACK_USE_2D_STAB_ROT) == 0) {
return 1;
return true;
}
return 0;
return false;
}
static void rna_tracking_stabTracks_begin(CollectionPropertyIterator *iter, PointerRNA *ptr)

2
source/blender/python/intern/bpy_rna.cc
View File

@@ -2348,7 +2348,7 @@ static int pyrna_prop_collection_ass_subscript_int(BPy_PropertyRNA *self,
PYRNA_PROP_COLLECTION_ABS_INDEX(-1);
if (RNA_property_collection_assign_int(&self->ptr, self->prop, keynum_abs, ptr) == 0) {
if (!RNA_property_collection_assign_int(&self->ptr, self->prop, keynum_abs, ptr)) {
const int len = RNA_property_collection_length(&self->ptr, self->prop);
if (keynum_abs >= len) {
PyErr_Format(PyExc_IndexError,