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>2013-07-01 11:15:12 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-07-01 11:15:12 +0400
commite9208e99b7663b7a81f3762ae8ed429d9e5f4cd7 (patch)
tree498b463f42194312b234707dcce4f454aae1d8d8 /source/blender
parent73d32fdcc2858c992e0cb2bad1de3de3830ad327 (diff)
bridge tool: calculate face normals before triangulating, own error when removing normal recalc from the bmesh operator.
also rename `Fill Grid` -> `Grid Fill` to match `Beauty Fill`
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/bmesh/operators/bmo_bridge.c8
-rw-r--r--source/blender/editors/mesh/editmesh_tools.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/bmesh/operators/bmo_bridge.c b/source/blender/bmesh/operators/bmo_bridge.c
index a517b7af502..045997fb6be 100644
--- a/source/blender/bmesh/operators/bmo_bridge.c
+++ b/source/blender/bmesh/operators/bmo_bridge.c
@@ -371,6 +371,14 @@ static void bridge_loop_pair(BMesh *bm,
BMO_op_initf(bm, &op_sub, 0,
"triangulate faces=%hf",
BM_ELEM_TAG, true);
+ /* calc normals for input faces before executing */
+ {
+ BMOIter siter;
+ BMFace *f;
+ BMO_ITER (f, &siter, op_sub.slots_in, "faces", BM_FACE) {
+ BM_face_normal_update(f);
+ }
+ }
BMO_op_exec(bm, &op_sub);
BMO_slot_buffer_flag_enable(bm, op_sub.slots_out, "faces.out", BM_FACE, FACE_OUT);
BMO_slot_buffer_hflag_enable(bm, op_sub.slots_out, "faces.out", BM_FACE, BM_ELEM_TAG, false);
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index fd448e5ac47..2fa6812d131 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -2739,7 +2739,7 @@ static int edbm_fill_grid_exec(bContext *C, wmOperator *op)
void MESH_OT_fill_grid(wmOperatorType *ot)
{
/* identifiers */
- ot->name = "Fill Grid";
+ ot->name = "Grid Fill";
ot->description = "Fill grid from two loops";
ot->idname = "MESH_OT_fill_grid";