Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2009-01-15 08:41:25 +0300
committerCampbell Barton <ideasman42@gmail.com>2009-01-15 08:41:25 +0300
commitac91b159ae149cb21f357a3b5e83374bb7d1d0ed (patch)
tree5d7663732e57a556a91663618376462beda881b1 /source/blender/editors
parent4c17156c9eb37cee7b6b96b8ef58e34e7ad281f3 (diff)
disallow identifiers with spaces 'cap end' wasn't working with the python api and made doc generation fail
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/mesh/editmesh_add.c6
-rw-r--r--source/blender/editors/mesh/mesh_ops.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c
index b1af1221cf3..b4459201f5a 100644
--- a/source/blender/editors/mesh/editmesh_add.c
+++ b/source/blender/editors/mesh/editmesh_add.c
@@ -1604,7 +1604,7 @@ static int add_primitive_cone_exec(bContext *C, wmOperator *op)
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 @@ void MESH_OT_add_primitive_cone(wmOperatorType *ot)
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 @@ void MESH_OT_add_primitive_monkey(wmOperatorType *ot)
/* api callbacks */
ot->exec= add_primitive_monkey_exec;
ot->poll= ED_operator_editmesh;
-} \ No newline at end of file
+}
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c
index b052f2ee4b5..1b1dca86ce2 100644
--- a/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@ -136,7 +136,7 @@ void ED_keymap_mesh(wmWindowManager *wm)
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);