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

no need to clamp python values twice when assigning.

Browse Source
This commit is contained in:
Campbell Barton
2012-05-11 10:25:12 +00:00
parent a2e225277f
commit b667f29a84
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1972,6 +1972,8 @@ void RNA_property_int_set_array(PointerRNA *ptr, PropertyRNA *prop, const int *v
IDPropertyTemplate val = {0}; IDPropertyTemplate val = {0};
IDProperty *group; IDProperty *group;
/* TODO: RNA_property_int_clamp_array(ptr, prop, &value); */
val.array.len = prop->totarraylength; val.array.len = prop->totarraylength;
val.array.type = IDP_INT; val.array.type = IDP_INT;
@@ -2232,6 +2234,8 @@ void RNA_property_float_set_array(PointerRNA *ptr, PropertyRNA *prop, const floa
IDPropertyTemplate val = {0}; IDPropertyTemplate val = {0};
IDProperty *group; IDProperty *group;
/* TODO: RNA_property_float_clamp_array(ptr, prop, &value); */
val.array.len = prop->totarraylength; val.array.len = prop->totarraylength;
val.array.type = IDP_FLOAT; val.array.type = IDP_FLOAT;

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

@@ -1550,9 +1550,13 @@ static int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyOb
} }
else { else {
int param_i = (int)param; int param_i = (int)param;
RNA_property_int_clamp(ptr, prop, &param_i); if (data) {
if (data) *((int *)data) = param_i; RNA_property_int_clamp(ptr, prop, &param_i);
else RNA_property_int_set(ptr, prop, param_i); *((int *)data) = param_i;
}
else {
RNA_property_int_set(ptr, prop, param_i);
}
} }
break; break;
} }
@@ -1567,9 +1571,13 @@ static int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyOb
return -1; return -1;
} }
else { else {
RNA_property_float_clamp(ptr, prop, (float *)&param); if (data) {
if (data) *((float *)data) = param; RNA_property_float_clamp(ptr, prop, (float *)&param);
else RNA_property_float_set(ptr, prop, param); *((float *)data) = param;
}
else {
RNA_property_float_set(ptr, prop, param);
}
} }
break; break;
} }