Revision: 37746
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37746
Author: campbellbarton
Date: 2011-06-23 06:13:21 +0000 (Thu, 23 Jun 2011)
Log Message:
-----------
checks in rna range functions that the max value cant be less than the min.
also fix for invalid rage for FILE_OT_filenum.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/makesrna/intern/rna_modifier.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
Modified: trunk/blender/source/blender/editors/space_file/file_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_file/file_ops.c 2011-06-23
06:11:13 UTC (rev 37745)
+++ trunk/blender/source/blender/editors/space_file/file_ops.c 2011-06-23
06:13:21 UTC (rev 37746)
@@ -1279,7 +1279,7 @@
ot->poll= ED_operator_file_active; /* <- important, handler is on
window level */
/* props */
- RNA_def_int(ot->srna, "increment", 1, 0, 100, "Increment", "", 0,100);
+ RNA_def_int(ot->srna, "increment", 1, -100, 100, "Increment", "",
-100,100);
}
static int file_rename_exec(bContext *C, wmOperator *UNUSED(op))
Modified: trunk/blender/source/blender/makesrna/intern/rna_access.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_access.c 2011-06-23
06:11:13 UTC (rev 37745)
+++ trunk/blender/source/blender/makesrna/intern/rna_access.c 2011-06-23
06:13:21 UTC (rev 37746)
@@ -1603,6 +1603,8 @@
IDProperty *idprop;
BLI_assert(RNA_property_type(prop) == PROP_INT);
+ /* useful to check on bad values but set function should clamp */
+ /* BLI_assert(RNA_property_int_clamp(ptr, prop, &value) == 0); */
if((idprop=rna_idproperty_check(&prop, ptr)))
IDP_Int(idprop)= value;
@@ -1825,6 +1827,8 @@
IDProperty *idprop;
BLI_assert(RNA_property_type(prop) == PROP_FLOAT);
+ /* useful to check on bad values but set function should clamp */
+ /* BLI_assert(RNA_property_float_clamp(ptr, prop, &value) == 0); */
if((idprop=rna_idproperty_check(&prop, ptr))) {
if(idprop->type == IDP_FLOAT)
Modified: trunk/blender/source/blender/makesrna/intern/rna_curve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_curve.c 2011-06-23
06:11:13 UTC (rev 37745)
+++ trunk/blender/source/blender/makesrna/intern/rna_curve.c 2011-06-23
06:13:21 UTC (rev 37746)
@@ -233,6 +233,7 @@
Curve *cu= (Curve*)ptr->id.data;
*min= 0;
*max= cu->totcol-1;
+ *max= MAX2(0, *max);
}
static void rna_Curve_active_textbox_index_range(PointerRNA *ptr, int *min,
int *max)
@@ -240,6 +241,7 @@
Curve *cu= (Curve*)ptr->id.data;
*min= 0;
*max= cu->totbox-1;
+ *max= MAX2(0, *max);
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_mesh.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2011-06-23
06:11:13 UTC (rev 37745)
+++ trunk/blender/source/blender/makesrna/intern/rna_mesh.c 2011-06-23
06:13:21 UTC (rev 37746)
@@ -305,6 +305,7 @@
Mesh *me= (Mesh*)ptr->id.data;
*min= 0;
*max= me->totcol-1;
+ *max= MAX2(0, *max);
}
static CustomData *rna_mesh_fdata(Mesh *me)
Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2011-06-23
06:11:13 UTC (rev 37745)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c 2011-06-23
06:13:21 UTC (rev 37746)
@@ -404,7 +404,8 @@
MultiresModifierData *mmd = (MultiresModifierData*)ptr->data;
*min = 0;
- *max = mmd->totlvl;
+ *max = mmd->totlvl; /* intentionally _not_ -1 */
+ *max= MAX2(0, *max);
}
static int rna_MultiresModifier_external_get(PointerRNA *ptr)
Modified: trunk/blender/source/blender/makesrna/intern/rna_object.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_object.c 2011-06-23
06:11:13 UTC (rev 37745)
+++ trunk/blender/source/blender/makesrna/intern/rna_object.c 2011-06-23
06:13:21 UTC (rev 37746)
@@ -1024,8 +1024,13 @@
Key *key= ob_get_key(ob);
*min= 0;
- *max= (key)? BLI_countlist(&key->block)-1: 0;
- *max= MAX2(0, *max);
+ if(key) {
+ *max= BLI_countlist(&key->block)-1;
+ if(*max < 0) *max= 0;
+ }
+ else {
+ *max= 0;
+ }
}
static int rna_Object_active_shape_key_index_get(PointerRNA *ptr)
Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c 2011-06-23
06:11:13 UTC (rev 37745)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2011-06-23
06:13:21 UTC (rev 37746)
@@ -700,7 +700,7 @@
ConsoleLine *ci= (ConsoleLine*)ptr->data;
*min= 0;
- *max= ci->len;
+ *max= ci->len; /* intentionally _not_ -1 */
}
/* Space Dopesheet */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
