diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-11 14:25:12 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-11 14:25:12 +0400 |
commit | b667f29a84384c360d7bdef9f048cf1386fcacf9 (patch) | |
tree | ca557e4112eeb7730ec62a6025e3342e5d9333b5 /source | |
parent | a2e225277f134aeb5ea6a9e5ebd884a3bcb98c88 (diff) |
no need to clamp python values twice when assigning.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_access.c | 4 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 20 |
2 files changed, 18 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c index e756865a14d..573d7216114 100644 --- a/source/blender/makesrna/intern/rna_access.c +++ b/source/blender/makesrna/intern/rna_access.c @@ -1972,6 +1972,8 @@ void RNA_property_int_set_array(PointerRNA *ptr, PropertyRNA *prop, const int *v IDPropertyTemplate val = {0}; IDProperty *group; + /* TODO: RNA_property_int_clamp_array(ptr, prop, &value); */ + val.array.len = prop->totarraylength; val.array.type = IDP_INT; @@ -2232,6 +2234,8 @@ void RNA_property_float_set_array(PointerRNA *ptr, PropertyRNA *prop, const floa IDPropertyTemplate val = {0}; IDProperty *group; + /* TODO: RNA_property_float_clamp_array(ptr, prop, &value); */ + val.array.len = prop->totarraylength; val.array.type = IDP_FLOAT; diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index 13c34465560..6c1e811aae0 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -1550,9 +1550,13 @@ static int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyOb } else { int param_i = (int)param; - RNA_property_int_clamp(ptr, prop, ¶m_i); - if (data) *((int *)data) = param_i; - else RNA_property_int_set(ptr, prop, param_i); + if (data) { + RNA_property_int_clamp(ptr, prop, ¶m_i); + *((int *)data) = param_i; + } + else { + RNA_property_int_set(ptr, prop, param_i); + } } break; } @@ -1567,9 +1571,13 @@ static int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyOb return -1; } else { - RNA_property_float_clamp(ptr, prop, (float *)¶m); - if (data) *((float *)data) = param; - else RNA_property_float_set(ptr, prop, param); + if (data) { + RNA_property_float_clamp(ptr, prop, (float *)¶m); + *((float *)data) = param; + } + else { + RNA_property_float_set(ptr, prop, param); + } } break; } |