Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix [#34033] Mesh customdata settings are missing

Browse Source 
Mesh edge number buttons were removed when the custom-data layers weren't present.

More of a usability regression than a bug.
This commit is contained in:
Campbell Barton
2013-02-19 14:36:26 +00:00
parent bc52cb1be3
commit 9f0dffb202
1 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/blender/editors/space_view3d/view3d_buttons.c
View File

@@ -222,6 +222,9 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
} }
} }
} }
else {
totedgedata = bm->totedgesel;
}
/* check for defgroups */ /* check for defgroups */
if (evedef) if (evedef)
@@ -427,26 +430,16 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
/* Meshes... */ /* Meshes... */
if (meshdata) { if (meshdata) {
if (totedgedata) { if (totedgedata) {
Mesh *me = ob->data; /* customdata layer added on demand */
BMEditMesh *em = me->edit_btmesh; uiDefButF(block, NUM, B_OBJECTPANELMEDIAN,
BMesh *bm = em->bm; totedgedata == 1 ? IFACE_("Crease:") : IFACE_("Mean Crease:"),
0, yi -= buth + but_margin, 200, buth,
const int cd_edge_bweight_offset = CustomData_get_offset(&bm->edata, CD_BWEIGHT); &(tfp->ve_median[M_CREASE]), 0.0, 1.0, 1, 3, TIP_("Weight used by SubSurf modifier"));
const int cd_edge_crease_offset = CustomData_get_offset(&bm->edata, CD_CREASE); /* customdata layer added on demand */
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN,
if (cd_edge_crease_offset != -1) { totedgedata == 1 ? IFACE_("Bevel Weight:") : IFACE_("Mean Bevel Weight:"),
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, 0, yi -= buth + but_margin, 200, buth,
totedgedata == 1 ? IFACE_("Crease:") : IFACE_("Mean Crease:"), &(tfp->ve_median[M_WEIGHT]), 0.0, 1.0, 1, 3, TIP_("Weight used by Bevel modifier"));
0, yi -= buth + but_margin, 200, buth,
&(tfp->ve_median[M_CREASE]), 0.0, 1.0, 1, 3, TIP_("Weight used by SubSurf modifier"));
}
if (cd_edge_bweight_offset != -1) {
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN,
totedgedata == 1 ? IFACE_("Bevel Weight:") : IFACE_("Mean Bevel Weight:"),
0, yi -= buth + but_margin, 200, buth,
&(tfp->ve_median[M_WEIGHT]), 0.0, 1.0, 1, 3, TIP_("Weight used by Bevel modifier"));
}
} }
if (totskinradius) { if (totskinradius) {
uiDefButF(block, NUM, B_OBJECTPANELMEDIAN, uiDefButF(block, NUM, B_OBJECTPANELMEDIAN,
@@ -529,7 +522,8 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
} }
if (median[M_CREASE] != 0.0f) { if (median[M_CREASE] != 0.0f) {
const int cd_edge_crease_offset = CustomData_get_offset(&bm->edata, CD_CREASE); const int cd_edge_crease_offset = (BM_mesh_cd_flag_ensure(bm, me, ME_CDFLAG_EDGE_CREASE),
CustomData_get_offset(&bm->edata, CD_CREASE));
const float sca = compute_scale_factor(ve_median[M_CREASE], median[M_CREASE]); const float sca = compute_scale_factor(ve_median[M_CREASE], median[M_CREASE]);
BMEdge *eed; BMEdge *eed;
@@ -561,7 +555,8 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float
} }
if (median[M_WEIGHT] != 0.0f) { if (median[M_WEIGHT] != 0.0f) {
const int cd_edge_bweight_offset = CustomData_get_offset(&bm->edata, CD_BWEIGHT); const int cd_edge_bweight_offset = (BM_mesh_cd_flag_ensure(bm, me, ME_CDFLAG_EDGE_BWEIGHT),
CustomData_get_offset(&bm->edata, CD_BWEIGHT));
const float sca = compute_scale_factor(ve_median[M_WEIGHT], median[M_WEIGHT]); const float sca = compute_scale_factor(ve_median[M_WEIGHT], median[M_WEIGHT]);
BMEdge *eed; BMEdge *eed;