Fix: Incorrect conversion from C bitfield syntax

Recent cleanups 9a8669ac81 and 1c790555a0
incorrectly interpereted the bitfield width syntax as a default
value. Also resolve two other compilation warnings.
This commit is contained in:
Hans Goudey 2022-04-28 11:18:56 -05:00
parent fbc884d2a8
commit 2d7957727c
4 changed files with 11 additions and 13 deletions

View File

@ -18,12 +18,12 @@ void BM_mesh_cd_flag_apply(BMesh *bm, char cd_flag);
char BM_mesh_cd_flag_from_bmesh(BMesh *bm);
struct BMeshFromMeshParams {
bool calc_face_normal : true;
bool calc_vert_normal : true;
bool calc_face_normal;
bool calc_vert_normal;
/* add a vertex CD_SHAPE_KEYINDEX layer */
bool add_key_index : true;
bool add_key_index;
/* set vertex coordinates from the shapekey */
bool use_shapekey : true;
bool use_shapekey;
/* define the active shape key (index + 1) */
int active_shapekey;
struct CustomData_MeshMasks cd_mask_extra;
@ -43,7 +43,7 @@ void BM_mesh_bm_from_me(BMesh *bm, const struct Mesh *me, const struct BMeshFrom
struct BMeshToMeshParams {
/** Update object hook indices & vertex parents. */
bool calc_object_remap : true;
bool calc_object_remap;
/**
* This re-assigns shape-key indices. Only do if the BMesh will have continued use
* to update the mesh & shape key in the future.
@ -53,12 +53,12 @@ struct BMeshToMeshParams {
* so a second flush or edit-mode exit doesn't run with indices
* that have become invalid from updating the shape-key, see T71865.
*/
bool update_shapekey_indices : true;
bool update_shapekey_indices;
/**
* Instead of copying the basis shape-key into the #MVert array,
* copy the #BMVert.co directly to #MVert.co (used for reading undo data).
*/
bool active_shapekey_to_mvert : true;
bool active_shapekey_to_mvert;
struct CustomData_MeshMasks cd_mask_extra;
};
/**

View File

@ -586,18 +586,15 @@ static void sequencer_main_clamp_view(const bContext *C, ARegion *region)
strip_boundbox.ymax = max_ff(sseq->runtime.timeline_clamp_custom_range, strip_boundbox.ymax);
rctf view_clamped = v2d->cur;
bool do_clamp = false;
const float range_y = BLI_rctf_size_y(&view_clamped);
if (view_clamped.ymax > strip_boundbox.ymax) {
view_clamped.ymax = strip_boundbox.ymax;
view_clamped.ymin = max_ff(strip_boundbox.ymin, strip_boundbox.ymax - range_y);
do_clamp = true;
}
if (view_clamped.ymin < strip_boundbox.ymin) {
view_clamped.ymin = strip_boundbox.ymin;
view_clamped.ymax = min_ff(strip_boundbox.ymax, strip_boundbox.ymin + range_y);
do_clamp = true;
}
}

View File

@ -694,6 +694,7 @@ static void view3d_ob_drop_matrix_from_snap(V3DSnapCursorState *snap_state,
{
V3DSnapCursorData *snap_data = ED_view3d_cursor_snap_data_get();
BLI_assert(snap_state->draw_box || snap_state->draw_plane);
UNUSED_VARS_NDEBUG(snap_state);
copy_m4_m3(obmat_final, snap_data->plane_omat);
copy_v3_v3(obmat_final[3], snap_data->loc);

View File

@ -70,9 +70,9 @@ struct SnapData_Mesh {
BVHTreeFromMesh treedata_mesh;
const MPoly *poly;
bool has_looptris = true;
bool has_loose_edge = true;
bool has_loose_vert = true;
bool has_looptris;
bool has_loose_edge;
bool has_loose_vert;
void clear()
{