Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix python foreach_get/foreach_set not working with dynamic sized arrays.

Browse Source
This commit is contained in:
Brecht Van Lommel
2013-02-01 18:00:41 +00:00
parent 1a5d0edf43
commit 4838a2c75a
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/makesrna/intern/rna_access.c
View File

@@ -3147,6 +3147,21 @@ int RNA_raw_type_sizeof(RawPropertyType type)
} }
} }
static int rna_property_array_length_all_dimensions(PointerRNA *ptr, PropertyRNA *prop)
{
int i, len[RNA_MAX_ARRAY_DIMENSION];
const int dim = RNA_property_array_dimension(ptr, prop, len);
int size;
if(dim == 0)
return 0;
for(size = 1, i = 0; i < dim; i++)
size *= len[i];
return size;
}
static int rna_raw_access(ReportList *reports, PointerRNA *ptr, PropertyRNA *prop, const char *propname, static int rna_raw_access(ReportList *reports, PointerRNA *ptr, PropertyRNA *prop, const char *propname,
void *inarray, RawPropertyType intype, int inlen, int set) void *inarray, RawPropertyType intype, int inlen, int set)
{ {
@@ -3181,12 +3196,18 @@ static int rna_raw_access(ReportList *reports, PointerRNA *ptr, PropertyRNA *pro
return 0; return 0;
} }
/* dynamic array? need to get length per item */
if(itemprop->getlength) {
itemprop = NULL;
}
/* try to access as raw array */
else if (RNA_property_collection_raw_array(ptr, prop, itemprop, &out)) {
int arraylen;
/* check item array */ /* check item array */
itemlen = RNA_property_array_length(&itemptr, itemprop); itemlen = RNA_property_array_length(&itemptr, itemprop);
/* try to access as raw array */ arraylen = (itemlen == 0) ? 1 : itemlen;
if (RNA_property_collection_raw_array(ptr, prop, itemprop, &out)) {
int arraylen = (itemlen == 0) ? 1 : itemlen;
if (in.len != arraylen * out.len) { if (in.len != arraylen * out.len) {
BKE_reportf(reports, RPT_ERROR, "Array length mismatch (expected %d, got %d)", BKE_reportf(reports, RPT_ERROR, "Array length mismatch (expected %d, got %d)",
out.len * arraylen, in.len); out.len * arraylen, in.len);
@@ -3243,7 +3264,7 @@ static int rna_raw_access(ReportList *reports, PointerRNA *ptr, PropertyRNA *pro
iprop = RNA_struct_find_property(&itemptr, propname); iprop = RNA_struct_find_property(&itemptr, propname);
if (iprop) { if (iprop) {
itemlen = RNA_property_array_length(&itemptr, iprop); itemlen = rna_property_array_length_all_dimensions(&itemptr, iprop);
itemtype = RNA_property_type(iprop); itemtype = RNA_property_type(iprop);
} }
else { else {