Commit: ab0be6ec2482da9c6495c4d8af992d01c44a2fbd Author: Campbell Barton Date: Mon Jan 23 17:31:44 2023 +1100 Branches: master https://developer.blender.org/rBab0be6ec2482da9c6495c4d8af992d01c44a2fbd
Cleanup: quiet clang warnings =================================================================== M source/blender/blenkernel/intern/volume.cc M source/blender/editors/uvedit/uvedit_unwrap_ops.cc M source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp M source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc =================================================================== diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index 0d8d66d69a9..7bf0c6f18a2 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -1489,7 +1489,7 @@ void BKE_volume_grid_transform_matrix_set(const Volume *volume, grid->setTransform(std::make_shared<openvdb::math::Transform>( std::make_shared<openvdb::math::AffineMap>(mat_openvdb))); #else - UNUSED_VARS(volume_grid, mat); + UNUSED_VARS(volume, volume_grid, mat); #endif } diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc index 208268c71c1..de98e3c48f7 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc @@ -1842,16 +1842,16 @@ void ED_uvedit_live_unwrap(const Scene *scene, Object **objects, int objects_len uvedit_unwrap_multi(scene, objects, objects_len, &options, nullptr); UVPackIsland_Params pack_island_params{}; - pack_island_params.rotate = true, - pack_island_params.only_selected_uvs = options.only_selected_uvs, - pack_island_params.only_selected_faces = options.only_selected_faces, + pack_island_params.rotate = true; + pack_island_params.only_selected_uvs = options.only_selected_uvs; + pack_island_params.only_selected_faces = options.only_selected_faces; pack_island_params.use_seams = !options.topology_from_uvs || - options.topology_from_uvs_use_seams, - pack_island_params.correct_aspect = options.correct_aspect, - pack_island_params.ignore_pinned = true, - pack_island_params.pin_unselected = options.pin_unselected, - pack_island_params.margin_method = ED_UVPACK_MARGIN_SCALED, - pack_island_params.margin = scene->toolsettings->uvcalc_margin, + options.topology_from_uvs_use_seams; + pack_island_params.correct_aspect = options.correct_aspect; + pack_island_params.ignore_pinned = true; + pack_island_params.pin_unselected = options.pin_unselected; + pack_island_params.margin_method = ED_UVPACK_MARGIN_SCALED; + pack_island_params.margin = scene->toolsettings->uvcalc_margin; ED_uvedit_pack_islands_multi( scene, objects, objects_len, nullptr, nullptr, &pack_island_params); diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index 1529c943963..53e25fb4a62 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -202,7 +202,7 @@ void BlenderFileLoader::clipTriangle(int numTris, float n1[3], float n2[3], float n3[3], - bool edgeMarks[], + bool edgeMarks[5], bool em1, bool em2, bool em3, diff --git a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc index 53ebf814a26..18d62b8b327 100644 --- a/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc +++ b/source/blender/modifiers/intern/MOD_solidify_nonmanifold.cc @@ -1267,15 +1267,18 @@ Mesh *MOD_solidify_nonmanifold_modifyMesh(ModifierData *md, memcpy(edges, g.edges, uint(first_split) * sizeof(*edges)); EdgeGroup edge_group_a{}; - edge_group_a.valid = true, edge_group_a.edges = edges, - edge_group_a.edges_len = uint(first_split), - edge_group_a.open_face_edge = MOD_SOLIDIFY_EMPTY_TAG, - edge_group_a.is_orig_closed = g.is_orig_closed, - edge_group_a.is_even_split = first_even_split, edge_group_a.split = 1, - edge_group_a.is_singularity = false, edge_group_a.topo_group = g.topo_group, + edge_group_a.valid = true; + edge_group_a.edges = edges; + edge_group_a.edges_len = uint(first_split); + edge_group_a.open_face_edge = MOD_SOLIDIFY_EMPTY_TAG; + edge_group_a.is_orig_closed = g.is_orig_closed; + edge_group_a.is_even_split = first_even_split; + edge_group_a.split = 1; + edge_group_a.is_singularity = false; + edge_group_a.topo_group = g.topo_group; zero_v3(edge_group_a.co); zero_v3(edge_group_a.no); - edge_group_a.new_vert = MOD_SOLIDIFY_EMPTY_TAG, + edge_group_a.new_vert = MOD_SOLIDIFY_EMPTY_TAG; edge_groups[j + prior_index] = edge_group_a; add_index++; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs