Howard Trickey
365a5b75c1
These changes are necessary. Need to mark vertices of edges passed in geom; also the normals.out slot has a custom element type, not ELEM, so need to prevent attempt by python code to convert it to an elem. But this leaves a memory leak. I will rework code to not use normals.out slot at all, but that's a bigger fix. Now there is a crash in a different place (GPU code). Think that if using Op on its own (instead of from edbm_bevel_calc, there needs to be a dependency graph update and maybe more?
81 lines
3.0 KiB
C
81 lines
3.0 KiB
C
/*
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* Contributor(s):
|
|
*
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
*/
|
|
|
|
/** \file blender/bmesh/operators/bmo_bevel.c
|
|
* \ingroup bmesh
|
|
*
|
|
* Bevel wrapper around #BM_mesh_bevel
|
|
*/
|
|
|
|
#include "BLI_utildefines.h"
|
|
|
|
#include "bmesh.h"
|
|
#include "bmesh_tools.h"
|
|
|
|
#include "intern/bmesh_operators_private.h" /* own include */
|
|
|
|
void bmo_bevel_exec(BMesh *bm, BMOperator *op)
|
|
{
|
|
const float offset = BMO_slot_float_get(op->slots_in, "offset");
|
|
const int offset_type = BMO_slot_int_get(op->slots_in, "offset_type");
|
|
const int seg = BMO_slot_int_get(op->slots_in, "segments");
|
|
const bool vonly = BMO_slot_bool_get(op->slots_in, "vertex_only");
|
|
const float profile = BMO_slot_float_get(op->slots_in, "profile");
|
|
const bool clamp_overlap = BMO_slot_bool_get(op->slots_in, "clamp_overlap");
|
|
const int material = BMO_slot_int_get(op->slots_in, "material");
|
|
const bool loop_slide = BMO_slot_bool_get(op->slots_in, "loop_slide");
|
|
const bool mark_seam = BMO_slot_bool_get(op->slots_in, "mark_seam");
|
|
const bool mark_sharp = BMO_slot_bool_get(op->slots_in, "mark_sharp");
|
|
const int hnmode = BMO_slot_int_get(op->slots_in, "hnmode");
|
|
|
|
if (offset > 0) {
|
|
BMOIter siter;
|
|
BMEdge *e;
|
|
BMVert *v;
|
|
|
|
/* first flush 'geom' into flags, this makes it possible to check connected data,
|
|
* BM_FACE is cleared so we can put newly created faces into a bmesh slot. */
|
|
BM_mesh_elem_hflag_disable_all(bm, BM_VERT | BM_EDGE | BM_FACE, BM_ELEM_TAG, false);
|
|
|
|
BMO_ITER (v, &siter, op->slots_in, "geom", BM_VERT) {
|
|
BM_elem_flag_enable(v, BM_ELEM_TAG);
|
|
}
|
|
|
|
BMO_ITER (e, &siter, op->slots_in, "geom", BM_EDGE) {
|
|
if (BM_edge_is_manifold(e)) {
|
|
BM_elem_flag_enable(e, BM_ELEM_TAG);
|
|
/* in case verts were not also included in the geom */
|
|
BM_elem_flag_enable(e->v1, BM_ELEM_TAG);
|
|
BM_elem_flag_enable(e->v2, BM_ELEM_TAG);
|
|
}
|
|
}
|
|
|
|
BM_mesh_bevel(
|
|
bm, offset, offset_type, seg, profile, vonly, false, clamp_overlap, NULL, -1, material,
|
|
loop_slide, mark_seam, mark_sharp, hnmode, op);
|
|
|
|
BMO_slot_buffer_from_enabled_hflag(bm, op, op->slots_out, "faces.out", BM_FACE, BM_ELEM_TAG);
|
|
BMO_slot_buffer_from_enabled_hflag(bm, op, op->slots_out, "edges.out", BM_EDGE, BM_ELEM_TAG);
|
|
BMO_slot_buffer_from_enabled_hflag(bm, op, op->slots_out, "verts.out", BM_VERT, BM_ELEM_TAG);
|
|
}
|
|
}
|