archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Move rna_access.c to C++

Browse Source 
See #103343

Pull Request #105060
This commit is contained in:
Hans Goudey
2023-02-22 14:04:57 +01:00
committed by Hans Goudey
parent 140a663f6f
commit 709013dca4
4 changed files with 294 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesrna/intern/CMakeLists.txt
View File

@@ -11,7 +11,7 @@ if(HAVE_MALLOC_STATS_H)
add_definitions(-DHAVE_MALLOC_STATS_H) add_definitions(-DHAVE_MALLOC_STATS_H)
endif() endif()
# files rna_access.c rna_define.c makesrna.c intentionally excluded. # files rna_access.cc rna_define.c makesrna.c intentionally excluded.
set(DEFSRC set(DEFSRC
rna_ID.c rna_ID.c
rna_action.c rna_action.c
@@ -422,7 +422,7 @@ add_custom_command(
# Build bf_rna # Build bf_rna
set(SRC set(SRC
rna_access.c rna_access.cc
rna_access_compare_override.c rna_access_compare_override.c
rna_path.cc rna_path.cc
${GENSRC} ${GENSRC}

558
source/blender/makesrna/intern/rna_access.c → source/blender/makesrna/intern/rna_access.cc
View File

File diff suppressed because it is too large Load Diff

4
source/blender/makesrna/intern/rna_rna.c
View File

@@ -426,7 +426,7 @@ static PointerRNA rna_Struct_properties_get(CollectionPropertyIterator *iter)
{ {
ListBaseIterator *internal = &iter->internal.listbase; ListBaseIterator *internal = &iter->internal.listbase;
/* we return either PropertyRNA* or IDProperty*, the rna_access.c /* we return either PropertyRNA* or IDProperty*, the rna_access.cc
* functions can handle both as PropertyRNA* with some tricks */ * functions can handle both as PropertyRNA* with some tricks */
return rna_pointer_inherit_refine(&iter->parent, &RNA_Property, internal->link); return rna_pointer_inherit_refine(&iter->parent, &RNA_Property, internal->link);
} }
@@ -455,7 +455,7 @@ static PointerRNA rna_Struct_functions_get(CollectionPropertyIterator *iter)
{ {
ListBaseIterator *internal = &iter->internal.listbase; ListBaseIterator *internal = &iter->internal.listbase;
/* we return either PropertyRNA* or IDProperty*, the rna_access.c /* we return either PropertyRNA* or IDProperty*, the rna_access.cc
* functions can handle both as PropertyRNA* with some tricks */ * functions can handle both as PropertyRNA* with some tricks */
return rna_pointer_inherit_refine(&iter->parent, &RNA_Function, internal->link); return rna_pointer_inherit_refine(&iter->parent, &RNA_Function, internal->link);
} }

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

@@ -5256,7 +5256,7 @@ static int foreach_parse_args(BPy_PropertyRNA *self,
target_tot = array_tot * (*r_attr_tot); target_tot = array_tot * (*r_attr_tot);
/* rna_access.c - rna_raw_access(...) uses this same method. */ /* rna_access.cc - rna_raw_access(...) uses this same method. */
if (target_tot != (*r_tot)) { if (target_tot != (*r_tot)) {
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"foreach_get(attr, sequence) sequence length mismatch given %d, needed %d", "foreach_get(attr, sequence) sequence length mismatch given %d, needed %d",