griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix [#30208] Bmesh Edit Mode: Add Primitive keeps old verts selected.

Browse Source 
cone depth was also incorrectly defaulting to 1.0
This commit is contained in:
Campbell Barton
2012-02-16 19:33:46 +00:00
parent 0e3537e374
commit 19d47c0efd
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/bmesh/operators/bmo_primitive.c
View File

@@ -246,7 +246,7 @@ void bmesh_create_grid_exec(BMesh *bm, BMOperator *op)
mul_m4_v3(mat, vec);
eve = BM_vert_create(bm, vec, NULL);
BM_elem_select_set(bm, eve, TRUE);
BMO_elem_flag_enable(bm, eve, VERT_MARK);
if (a) {
e = BM_edge_create(bm, preveve, eve, NULL, TRUE);
@@ -397,7 +397,7 @@ void bmesh_create_icosphere_exec(BMesh *bm, BMOperator *op)
eva[a] = BM_vert_create(bm, vec, NULL);
mul_m4_v3(mat, eva[a]->co);
BM_elem_select_set(bm, eva[a], TRUE);
BMO_elem_flag_enable(bm, eva[a], VERT_MARK);
}
for (a = 0; a < 20; a++) {

3
source/blender/editors/mesh/bmeshutils.c
View File

@@ -208,6 +208,9 @@ int EDBM_CallAndSelectOpf(BMEditMesh *em, wmOperator *op, const char *selectslot
em->emcopyusers++;
BMO_op_exec(bm, &bmop);
BM_mesh_elem_flag_disable_all(em->bm, BM_VERT|BM_EDGE|BM_FACE, BM_ELEM_SELECT);
BMO_slot_buffer_hflag_enable(em->bm, &bmop, selectslot, BM_ELEM_SELECT, BM_ALL);
va_end(list);

2
source/blender/editors/mesh/editbmesh_add.c
View File

@@ -385,7 +385,7 @@ void MESH_OT_primitive_cone_add(wmOperatorType *ot)
RNA_def_int(ot->srna, "vertices", 32, INT_MIN, INT_MAX, "Vertices", "", 2, 500);
RNA_def_float(ot->srna, "radius1", 1.0f, 0.0, FLT_MAX, "Radius 1", "", 0.001, 100.00);
RNA_def_float(ot->srna, "radius2", 0.0f, 0.0, FLT_MAX, "Radius 2", "", 0.001, 100.00);
prop = RNA_def_float(ot->srna, "depth", 1.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);
prop = RNA_def_float(ot->srna, "depth", 2.0f, 0.0, FLT_MAX, "Depth", "", 0.001, 100.00);
RNA_def_property_subtype(prop, PROP_DISTANCE);
RNA_def_enum(ot->srna, "end_fill_type", fill_type_items, 1, "Base Fill Type", "");