diff options
author | Campbell Barton <campbell@blender.org> | 2022-11-08 08:58:37 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-11-08 08:58:37 +0300 |
commit | 642ff82f749dc480875e2047eb5e9a9227f59093 (patch) | |
tree | 337729f263df8cc9ead4bd43e033a7a7d41a43ea /source/blender | |
parent | 3c1fb9aea1c843f9a60e538505eadfce95fdf728 (diff) |
Cleanup: format, remove commented code & unused variable
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/displist.cc | 3 | ||||
-rw-r--r-- | source/blender/editors/object/object_remesh.cc | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap_object.cc | 1 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_color.c | 9 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 9 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_ui_common.c | 3 |
6 files changed, 7 insertions, 20 deletions
diff --git a/source/blender/blenkernel/intern/displist.cc b/source/blender/blenkernel/intern/displist.cc index f8117a89198..2e285170b93 100644 --- a/source/blender/blenkernel/intern/displist.cc +++ b/source/blender/blenkernel/intern/displist.cc @@ -533,7 +533,8 @@ static ModifierData *curve_get_tessellate_point(const Scene *scene, } if (md->type == eModifierType_Smooth) { - /* Smooth modifier works with mesh edges explicitly (so needs tesselation, thus cannnot work on control points). */ + /* Smooth modifier works with mesh edges explicitly + * (so needs tessellation, thus cannot work on control points). */ md->mode &= ~eModifierMode_ApplyOnSpline; return pretessellatePoint; } diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc index 69fa84aa260..c3764b34469 100644 --- a/source/blender/editors/object/object_remesh.cc +++ b/source/blender/editors/object/object_remesh.cc @@ -286,7 +286,7 @@ static void voxel_size_parallel_lines_draw(uint pos3d, immEnd(); } -static void voxel_size_edit_draw(const bContext *C, ARegion * /*ar*/, void *arg) +static void voxel_size_edit_draw(const bContext *C, ARegion * /*region*/, void *arg) { VoxelSizeEditCustomData *cd = static_cast<VoxelSizeEditCustomData *>(arg); diff --git a/source/blender/editors/transform/transform_snap_object.cc b/source/blender/editors/transform/transform_snap_object.cc index 1663fd12586..c0030ae1a70 100644 --- a/source/blender/editors/transform/transform_snap_object.cc +++ b/source/blender/editors/transform/transform_snap_object.cc @@ -241,7 +241,6 @@ static void snap_object_data_mesh_get(SnapObjectContext *sctx, BVHTreeFromMesh *r_treedata) { const Span<MVert> verts = me_eval->verts(); - const Span<MEdge> edges = me_eval->edges(); const Span<MPoly> polys = me_eval->polys(); const Span<MLoop> loops = me_eval->loops(); diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c index fe4d51bafb9..2ba82da09bb 100644 --- a/source/blender/makesrna/intern/rna_color.c +++ b/source/blender/makesrna/intern/rna_color.c @@ -577,15 +577,8 @@ static void rna_ColorManagedColorspaceSettings_colorspace_set(struct PointerRNA } static const EnumPropertyItem *rna_ColorManagedColorspaceSettings_colorspace_itemf( - bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free) + bContext *UNUSED(C), PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free) { -# if 0 /* FIXME: Causes blank drop-down, see T102316. */ - if (C == NULL) { - return rna_enum_color_space_convert_default_items; - } -# else - UNUSED_VARS(C); -# endif EnumPropertyItem *items = NULL; int totitem = 0; diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 9dc940059dd..cfec020c739 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -4512,15 +4512,8 @@ static void rna_NodeConvertColorSpace_to_color_space_set(struct PointerRNA *ptr, } static const EnumPropertyItem *rna_NodeConvertColorSpace_color_space_itemf( - bContext *C, PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free) + bContext *UNUSED(C), PointerRNA *UNUSED(ptr), PropertyRNA *UNUSED(prop), bool *r_free) { -# if 0 /* FIXME: Causes blank drop-down, see T102316. */ - if (C == NULL) { - return rna_enum_color_space_convert_default_items; - } -# else - UNUSED_VARS(C); -# endif EnumPropertyItem *items = NULL; int totitem = 0; diff --git a/source/blender/modifiers/intern/MOD_ui_common.c b/source/blender/modifiers/intern/MOD_ui_common.c index e882435077a..0f6c40610a0 100644 --- a/source/blender/modifiers/intern/MOD_ui_common.c +++ b/source/blender/modifiers/intern/MOD_ui_common.c @@ -352,7 +352,8 @@ static void modifier_panel_header(const bContext *C, Panel *panel) buttons_number++; } /* Some modifiers can work with pre-tessellated curves only. */ - else if (ELEM(md->type, eModifierType_Hook, eModifierType_Softbody, eModifierType_MeshDeform)) { + else if (ELEM( + md->type, eModifierType_Hook, eModifierType_Softbody, eModifierType_MeshDeform)) { /* Add button (appearing to be ON) and add tip why this can't be changed. */ sub = uiLayoutRow(row, true); uiBlock *block = uiLayoutGetBlock(sub); |