[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18519] branches/blender2.5/blender/source /blender: disallow identifiers with spaces 'cap end' wasn' t working with the python api and made doc generation fail

[Campbell Barton]

Revision: 18519
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18519
Author:   campbellbarton
Date:     2009-01-15 06:41:25 +0100 (Thu, 15 Jan 2009)

Log Message:
-----------
disallow identifiers with spaces 'cap end' wasn't working with the python api and made doc generation fail

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c
    branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c

Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c	2009-01-15 05:09:33 UTC (rev 18518)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c	2009-01-15 05:41:25 UTC (rev 18519)
@@ -1604,7 +1604,7 @@
 	
 	dia = RNA_float_get(op->ptr,"radius");
 	
-	make_prim(obedit, PRIM_CONE, mat, RNA_int_get(op->ptr,"vertices"), 32, 2, dia, RNA_float_get(op->ptr,"depth")/2, 1, RNA_int_get(op->ptr,"cap end"));
+	make_prim(obedit, PRIM_CONE, mat, RNA_int_get(op->ptr,"vertices"), 32, 2, dia, RNA_float_get(op->ptr,"depth")/2, 1, RNA_int_get(op->ptr,"cap_end"));
 	
 	ED_undo_push(C, "Add Cone");	// Note this will become depricated 
 	WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
@@ -1630,7 +1630,7 @@
 	RNA_def_property(ot->srna, "vertices", PROP_INT, PROP_NONE);
 	RNA_def_property(ot->srna, "radius", PROP_FLOAT, PROP_NONE);
 	RNA_def_property(ot->srna, "depth", PROP_FLOAT, PROP_NONE);
-	RNA_def_property(ot->srna, "cap end",PROP_INT, PROP_NONE);
+	RNA_def_property(ot->srna, "cap_end",PROP_INT, PROP_NONE);
 }
 
 static int add_primitive_grid_exec(bContext *C, wmOperator *op)
@@ -1687,4 +1687,4 @@
 	/* api callbacks */
 	ot->exec= add_primitive_monkey_exec;
 	ot->poll= ED_operator_editmesh;
-}
\ No newline at end of file
+}

Modified: branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c	2009-01-15 05:09:33 UTC (rev 18518)
+++ branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c	2009-01-15 05:41:25 UTC (rev 18519)
@@ -136,7 +136,7 @@
 	RNA_int_set(cone->ptr,"vertices",32);
 	RNA_float_set(cone->ptr,"radius",2);
 	RNA_float_set(cone->ptr,"depth",-3);
-	RNA_float_set(cone->ptr,"cap end",0);
+	RNA_float_set(cone->ptr,"cap_end",0);
 
 	WM_keymap_add_item(keymap, "MESH_OT_add_primitive_grid", NINEKEY, KM_PRESS, KM_CTRL, 0);
 	

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c	2009-01-15 05:09:33 UTC (rev 18518)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c	2009-01-15 05:41:25 UTC (rev 18519)
@@ -200,6 +200,11 @@
 			continue;
 		}
 
+		if (identifier[a]==' ') {
+			strcpy(error, "spaces are not ok in identifier names");
+			return 0;
+		}
+
 		if (isalnum(identifier[a])==0) {
 			strcpy(error, "one of the characters failed an isalnum() check and is not an underscore");
 			return 0;