kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

bmesh operator rename inset -> inset_region

Browse Source
This commit is contained in:
Campbell Barton 2013-04-05 22:56:01 +00:00
parent 8fd42b2aae
commit bb81923c3e
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/blender/bmesh/intern/bmesh_opdefines.c
View File

@ -1508,26 +1508,26 @@ static BMOpDefine bmo_inset_individual_def = {
"inset_individual", "inset_individual",
/* slots_in */ /* slots_in */
{{"faces", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* input faces */ {{"faces", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* input faces */
{"thickness", BMO_OP_SLOT_FLT}, {"thickness", BMO_OP_SLOT_FLT},
{"depth", BMO_OP_SLOT_FLT}, {"depth", BMO_OP_SLOT_FLT},
{"use_even_offset", BMO_OP_SLOT_BOOL}, {"use_even_offset", BMO_OP_SLOT_BOOL},
{{'\0'}}, {{'\0'}},
}, },
/* slots_out */ /* slots_out */
{{"faces.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* output faces */ {{"faces.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* output faces */
{{'\0'}}, {{'\0'}},
}, },
bmo_inset_individual_exec, bmo_inset_individual_exec,
0 0
}; };
/* /*
* Face Inset. * Face Inset (Regions).
* *
* Inset or outset faces. * Inset or outset face regions.
*/ */
static BMOpDefine bmo_inset_def = { static BMOpDefine bmo_inset_region_def = {
"inset", "inset_region",
/* slots_in */ /* slots_in */
{{"faces", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* input faces */ {{"faces", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* input faces */
{"use_boundary", BMO_OP_SLOT_BOOL}, {"use_boundary", BMO_OP_SLOT_BOOL},
@ -1542,7 +1542,7 @@ static BMOpDefine bmo_inset_def = {
{{"faces.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* output faces */ {{"faces.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* output faces */
{{'\0'}}, {{'\0'}},
}, },
bmo_inset_exec, bmo_inset_region_exec,
0 0
}; };
@ -1670,7 +1670,7 @@ const BMOpDefine *bmo_opdefines[] = {
&bmo_extrude_vert_indiv_def, &bmo_extrude_vert_indiv_def,
&bmo_find_doubles_def, &bmo_find_doubles_def,
&bmo_inset_individual_def, &bmo_inset_individual_def,
&bmo_inset_def, &bmo_inset_region_def,
&bmo_join_triangles_def, &bmo_join_triangles_def,
&bmo_mesh_to_bmesh_def, &bmo_mesh_to_bmesh_def,
&bmo_mirror_def, &bmo_mirror_def,

2
source/blender/bmesh/intern/bmesh_operators_private.h
View File

@ -66,7 +66,7 @@ void bmo_extrude_face_region_exec(BMesh *bm, BMOperator *op);
void bmo_extrude_vert_indiv_exec(BMesh *bm, BMOperator *op); void bmo_extrude_vert_indiv_exec(BMesh *bm, BMOperator *op);
void bmo_find_doubles_exec(BMesh *bm, BMOperator *op); void bmo_find_doubles_exec(BMesh *bm, BMOperator *op);
void bmo_inset_individual_exec(BMesh *bm, BMOperator *op); void bmo_inset_individual_exec(BMesh *bm, BMOperator *op);
void bmo_inset_exec(BMesh *bm, BMOperator *op); void bmo_inset_region_exec(BMesh *bm, BMOperator *op);
void bmo_join_triangles_exec(BMesh *bm, BMOperator *op); void bmo_join_triangles_exec(BMesh *bm, BMOperator *op);
void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op); void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op);
void bmo_mirror_exec(BMesh *bm, BMOperator *op); void bmo_mirror_exec(BMesh *bm, BMOperator *op);

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

@ -42,7 +42,7 @@
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/* Inset Indervidual */ /* Inset Individual */
/* Holds Per-Face Inset Edge Data */ /* Holds Per-Face Inset Edge Data */
@ -316,7 +316,7 @@ static BMLoop *bm_edge_is_mixed_face_tag(BMLoop *l)
* - inset the new edges into their faces. * - inset the new edges into their faces.
*/ */
void bmo_inset_exec(BMesh *bm, BMOperator *op) void bmo_inset_region_exec(BMesh *bm, BMOperator *op)
{ {
const bool use_outset = BMO_slot_bool_get(op->slots_in, "use_outset"); const bool use_outset = BMO_slot_bool_get(op->slots_in, "use_outset");
const bool use_boundary = BMO_slot_bool_get(op->slots_in, "use_boundary") && (use_outset == false); const bool use_boundary = BMO_slot_bool_get(op->slots_in, "use_boundary") && (use_outset == false);

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

@ -208,7 +208,7 @@ static int edbm_inset_calc(wmOperator *op)
} }
else { else {
EDBM_op_init(em, &bmop, op, EDBM_op_init(em, &bmop, op,
"inset faces=%hf use_boundary=%b use_even_offset=%b use_relative_offset=%b " "inset_region faces=%hf use_boundary=%b use_even_offset=%b use_relative_offset=%b "
"thickness=%f depth=%f use_outset=%b", "thickness=%f depth=%f use_outset=%b",
BM_ELEM_SELECT, use_boundary, use_even_offset, use_relative_offset, BM_ELEM_SELECT, use_boundary, use_even_offset, use_relative_offset,
thickness, depth, use_outset); thickness, depth, use_outset);