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

RNA:

Browse Source 
* boolean/int/float_get_array now works for non-array
  properties as well, just filling in a single value.
This commit is contained in:
Brecht Van Lommel
2009-03-07 15:23:03 +00:00
parent d7479f99b0
commit c20b4d6618
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -586,8 +586,14 @@ void RNA_property_boolean_get_array(PointerRNA *ptr, PropertyRNA *prop, int *val
BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop; BooleanPropertyRNA *bprop= (BooleanPropertyRNA*)prop;
IDProperty *idprop; IDProperty *idprop;
if((idprop=rna_idproperty_check(&prop, ptr))) if((idprop=rna_idproperty_check(&prop, ptr))) {
memcpy(values, IDP_Array(idprop), sizeof(int)*idprop->len); if(prop->arraylength == 0)
values[0]= RNA_property_boolean_get(ptr, prop);
else
memcpy(values, IDP_Array(idprop), sizeof(int)*idprop->len);
}
else if(prop->arraylength == 0)
values[0]= RNA_property_boolean_get(ptr, prop);
else if(bprop->getarray) else if(bprop->getarray)
bprop->getarray(ptr, values); bprop->getarray(ptr, values);
else if(bprop->defaultarray) else if(bprop->defaultarray)
@@ -677,8 +683,14 @@ void RNA_property_int_get_array(PointerRNA *ptr, PropertyRNA *prop, int *values)
IntPropertyRNA *iprop= (IntPropertyRNA*)prop; IntPropertyRNA *iprop= (IntPropertyRNA*)prop;
IDProperty *idprop; IDProperty *idprop;
if((idprop=rna_idproperty_check(&prop, ptr))) if((idprop=rna_idproperty_check(&prop, ptr))) {
memcpy(values, IDP_Array(idprop), sizeof(int)*idprop->len); if(prop->arraylength == 0)
values[0]= RNA_property_int_get(ptr, prop);
else
memcpy(values, IDP_Array(idprop), sizeof(int)*idprop->len);
}
else if(prop->arraylength == 0)
values[0]= RNA_property_int_get(ptr, prop);
else if(iprop->getarray) else if(iprop->getarray)
iprop->getarray(ptr, values); iprop->getarray(ptr, values);
else if(iprop->defaultarray) else if(iprop->defaultarray)
@@ -779,7 +791,9 @@ void RNA_property_float_get_array(PointerRNA *ptr, PropertyRNA *prop, float *val
int i; int i;
if((idprop=rna_idproperty_check(&prop, ptr))) { if((idprop=rna_idproperty_check(&prop, ptr))) {
if(idprop->subtype == IDP_FLOAT) { if(prop->arraylength == 0)
values[0]= RNA_property_float_get(ptr, prop);
else if(idprop->subtype == IDP_FLOAT) {
memcpy(values, IDP_Array(idprop), sizeof(float)*idprop->len); memcpy(values, IDP_Array(idprop), sizeof(float)*idprop->len);
} }
else { else {
@@ -787,13 +801,14 @@ void RNA_property_float_get_array(PointerRNA *ptr, PropertyRNA *prop, float *val
values[i]= (float)(((double*)IDP_Array(idprop))[i]); values[i]= (float)(((double*)IDP_Array(idprop))[i]);
} }
} }
else if(prop->arraylength == 0)
values[0]= RNA_property_float_get(ptr, prop);
else if(fprop->getarray) else if(fprop->getarray)
fprop->getarray(ptr, values); fprop->getarray(ptr, values);
else if(fprop->defaultarray) else if(fprop->defaultarray)
memcpy(values, fprop->defaultarray, sizeof(float)*prop->arraylength); memcpy(values, fprop->defaultarray, sizeof(float)*prop->arraylength);
else else
memset(values, 0, sizeof(float)*prop->arraylength); memset(values, 0, sizeof(float)*prop->arraylength);
} }
float RNA_property_float_get_index(PointerRNA *ptr, PropertyRNA *prop, int index) float RNA_property_float_get_index(PointerRNA *ptr, PropertyRNA *prop, int index)