[Bf-blender-cvs] [cfaba8a] master: Fix RNA property clamp assigning in Python

Campbell Barton noreply at git.blender.org
Thu Mar 3 02:53:26 CET 2016


Commit: cfaba8ad6c2b63e2d1f5956cd3209171d1366d38
Author: Campbell Barton
Date:   Thu Mar 3 12:33:43 2016 +1100
Branches: master
https://developer.blender.org/rBcfaba8ad6c2b63e2d1f5956cd3209171d1366d38

Fix RNA property clamp assigning in Python

On first assignment the value was clamped, but successive assignments weren't.

===================================================================

M	source/blender/makesrna/intern/rna_access.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index d037600..6d48c69 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -2098,6 +2098,7 @@ void RNA_property_int_set(PointerRNA *ptr, PropertyRNA *prop, int value)
 	/* BLI_assert(RNA_property_int_clamp(ptr, prop, &value) == 0); */
 
 	if ((idprop = rna_idproperty_check(&prop, ptr))) {
+		RNA_property_int_clamp(ptr, prop, &value);
 		IDP_Int(idprop) = value;
 		rna_idproperty_touch(idprop);
 	}
@@ -2356,6 +2357,7 @@ void RNA_property_float_set(PointerRNA *ptr, PropertyRNA *prop, float value)
 	/* BLI_assert(RNA_property_float_clamp(ptr, prop, &value) == 0); */
 
 	if ((idprop = rna_idproperty_check(&prop, ptr))) {
+		RNA_property_float_clamp(ptr, prop, &value);
 		if (idprop->type == IDP_FLOAT)
 			IDP_Float(idprop) = value;
 		else




More information about the Bf-blender-cvs mailing list