diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-06 02:56:01 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-06 02:56:01 +0400 |
commit | bb81923c3e71619a6aaa47caa1b9ee834b8481c2 (patch) | |
tree | a354b251777f83d80bb1c2bc48e526f1bf55fea9 | |
parent | 8fd42b2aae6c1415be2365d09153fb8578aeecaa (diff) |
bmesh operator rename inset -> inset_region
-rw-r--r-- | source/blender/bmesh/intern/bmesh_opdefines.c | 22 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_operators_private.h | 2 | ||||
-rw-r--r-- | source/blender/bmesh/operators/bmo_inset.c | 4 | ||||
-rw-r--r-- | source/blender/editors/mesh/editmesh_inset.c | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/source/blender/bmesh/intern/bmesh_opdefines.c b/source/blender/bmesh/intern/bmesh_opdefines.c index 31398b452bd..c76bf15022c 100644 --- a/source/blender/bmesh/intern/bmesh_opdefines.c +++ b/source/blender/bmesh/intern/bmesh_opdefines.c @@ -1508,26 +1508,26 @@ static BMOpDefine bmo_inset_individual_def = { "inset_individual", /* slots_in */ {{"faces", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* input faces */ - {"thickness", BMO_OP_SLOT_FLT}, - {"depth", BMO_OP_SLOT_FLT}, - {"use_even_offset", BMO_OP_SLOT_BOOL}, - {{'\0'}}, + {"thickness", BMO_OP_SLOT_FLT}, + {"depth", BMO_OP_SLOT_FLT}, + {"use_even_offset", BMO_OP_SLOT_BOOL}, + {{'\0'}}, }, /* slots_out */ {{"faces.out", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* output faces */ - {{'\0'}}, + {{'\0'}}, }, bmo_inset_individual_exec, 0 }; /* - * Face Inset. + * Face Inset (Regions). * - * Inset or outset faces. + * Inset or outset face regions. */ -static BMOpDefine bmo_inset_def = { - "inset", +static BMOpDefine bmo_inset_region_def = { + "inset_region", /* slots_in */ {{"faces", BMO_OP_SLOT_ELEMENT_BUF, {BM_FACE}}, /* input faces */ {"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 */ {{'\0'}}, }, - bmo_inset_exec, + bmo_inset_region_exec, 0 }; @@ -1670,7 +1670,7 @@ const BMOpDefine *bmo_opdefines[] = { &bmo_extrude_vert_indiv_def, &bmo_find_doubles_def, &bmo_inset_individual_def, - &bmo_inset_def, + &bmo_inset_region_def, &bmo_join_triangles_def, &bmo_mesh_to_bmesh_def, &bmo_mirror_def, diff --git a/source/blender/bmesh/intern/bmesh_operators_private.h b/source/blender/bmesh/intern/bmesh_operators_private.h index bae29540b62..6f9628bc468 100644 --- a/source/blender/bmesh/intern/bmesh_operators_private.h +++ b/source/blender/bmesh/intern/bmesh_operators_private.h @@ -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_find_doubles_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_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op); void bmo_mirror_exec(BMesh *bm, BMOperator *op); diff --git a/source/blender/bmesh/operators/bmo_inset.c b/source/blender/bmesh/operators/bmo_inset.c index 12d1c8e0376..d8ed511bc94 100644 --- a/source/blender/bmesh/operators/bmo_inset.c +++ b/source/blender/bmesh/operators/bmo_inset.c @@ -42,7 +42,7 @@ /* -------------------------------------------------------------------- */ -/* Inset Indervidual */ +/* Inset Individual */ /* 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. */ -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_boundary = BMO_slot_bool_get(op->slots_in, "use_boundary") && (use_outset == false); diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c index fd7ca512a13..a9093824a9d 100644 --- a/source/blender/editors/mesh/editmesh_inset.c +++ b/source/blender/editors/mesh/editmesh_inset.c @@ -208,7 +208,7 @@ static int edbm_inset_calc(wmOperator *op) } else { 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", BM_ELEM_SELECT, use_boundary, use_even_offset, use_relative_offset, thickness, depth, use_outset); |