[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46546] trunk/blender/source/blender: no need to clamp python values twice when assigning.

[Campbell Barton]

Revision: 46546
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46546
Author:   campbellbarton
Date:     2012-05-11 10:25:12 +0000 (Fri, 11 May 2012)
Log Message:
-----------
no need to clamp python values twice when assigning.

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_access.c
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c	2012-05-11 10:20:35 UTC (rev 46545)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c	2012-05-11 10:25:12 UTC (rev 46546)
@@ -1972,6 +1972,8 @@
 		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 @@
 		IDPropertyTemplate val = {0};
 		IDProperty *group;
 
+		/* TODO: RNA_property_float_clamp_array(ptr, prop, &value); */
+
 		val.array.len = prop->totarraylength;
 		val.array.type = IDP_FLOAT;
 

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2012-05-11 10:20:35 UTC (rev 46545)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2012-05-11 10:25:12 UTC (rev 46546)
@@ -1550,9 +1550,13 @@
 				}
 				else {
 					int param_i = (int)param;
-					RNA_property_int_clamp(ptr, prop, &param_i);
-					if (data) *((int *)data) = param_i;
-					else RNA_property_int_set(ptr, prop, param_i);
+					if (data) {
+						RNA_property_int_clamp(ptr, prop, &param_i);
+						*((int *)data) = param_i;
+					}
+					else {
+						RNA_property_int_set(ptr, prop, param_i);
+					}
 				}
 				break;
 			}
@@ -1567,9 +1571,13 @@
 					return -1;
 				}
 				else {
-					RNA_property_float_clamp(ptr, prop, (float *)&param);
-					if (data) *((float *)data) = param;
-					else RNA_property_float_set(ptr, prop, param);
+					if (data) {
+						RNA_property_float_clamp(ptr, prop, (float *)&param);
+						*((float *)data) = param;
+					}
+					else {
+						RNA_property_float_set(ptr, prop, param);
+					}
 				}
 				break;
 			}