From e38ff7c06db09ff01326c6614895620b8ec9b75f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 25 Sep 2023 16:56:17 +1000 Subject: [PATCH] Cleanup: use C++ comments for disabled code --- intern/cycles/bvh/build.cpp | 4 +- intern/cycles/kernel/sample/mapping.h | 4 +- intern/cycles/kernel/util/differential.h | 4 +- intern/cycles/util/system.cpp | 2 +- source/blender/blenkernel/BKE_cloth.hh | 2 +- .../blenkernel/intern/CCGSubSurf_intern.h | 18 +++--- .../blender/blenkernel/intern/colortools.cc | 2 +- .../blender/blenkernel/intern/constraint.cc | 62 +++++++++---------- source/blender/blenkernel/intern/curve.cc | 8 +-- source/blender/blenkernel/intern/ipo.cc | 2 +- source/blender/blenkernel/intern/key.cc | 8 ++- source/blender/blenkernel/intern/mask.cc | 2 +- .../blenkernel/intern/mask_evaluate.cc | 8 +-- .../blenkernel/intern/mask_rasterize.cc | 6 +- .../blender/blenkernel/intern/packedFile.cc | 2 +- .../blenkernel/intern/particle_distribute.cc | 2 +- .../blender/blenkernel/intern/pbvh_bmesh.cc | 2 +- .../blender/blenkernel/intern/pointcache.cc | 2 +- source/blender/blenkernel/intern/sound.cc | 2 +- .../blender/blenkernel/intern/subsurf_ccg.cc | 2 +- source/blender/blenkernel/intern/text.cc | 4 +- .../blenkernel/intern/vfontdata_freetype.cc | 4 +- source/blender/blenlib/BLI_math_quaternion.hh | 6 +- source/blender/blenlib/BLI_smallhash.h | 2 +- source/blender/blenlib/intern/array_utils.c | 4 +- source/blender/blenlib/intern/math_geom.c | 4 +- source/blender/blenlib/intern/scanfill.c | 21 +++++-- source/blender/blenloader/intern/readfile.cc | 2 +- source/blender/bmesh/intern/bmesh_core.cc | 2 +- source/blender/bmesh/intern/bmesh_edgeloop.cc | 2 +- .../bmesh/intern/bmesh_iterators_inline.h | 2 +- source/blender/bmesh/intern/bmesh_mods.cc | 2 +- .../blender/bmesh/operators/bmo_dissolve.cc | 2 +- .../bmesh/operators/bmo_mesh_convert.cc | 4 +- .../blender/bmesh/operators/bmo_subdivide.cc | 10 +-- .../bmesh/operators/bmo_triangulate.cc | 4 +- source/blender/bmesh/tools/bmesh_bevel.cc | 2 +- .../operations/COM_ChannelMatteOperation.h | 12 ++-- .../COM_MovieDistortionOperation.cc | 2 +- .../draw/engines/eevee/eevee_lightcache.cc | 2 +- .../draw/engines/eevee_next/eevee_shadow.cc | 2 +- .../eevee_next/shaders/eevee_camera_lib.glsl | 4 +- .../eevee_next/shaders/eevee_shadow_lib.glsl | 4 +- .../draw/engines/overlay/overlay_armature.cc | 2 +- .../animation/anim_channels_defines.cc | 2 +- source/blender/editors/curve/editcurve.cc | 2 +- source/blender/editors/curve/editfont.cc | 1 - .../editors/gpencil_legacy/annotate_paint.cc | 8 +-- .../editors/interface/interface_handlers.cc | 4 +- .../editors/interface/interface_layout.cc | 4 +- .../interface/interface_region_menu_pie.cc | 2 +- source/blender/editors/interface/view2d.cc | 2 +- source/blender/editors/mask/mask_draw.cc | 4 +- source/blender/editors/mesh/editmesh_knife.cc | 2 +- source/blender/editors/object/object_add.cc | 2 +- .../blender/editors/object/object_modifier.cc | 2 +- .../editors/object/object_relations.cc | 4 +- .../editors/object/object_transform.cc | 2 +- .../editors/sculpt_paint/paint_image_proj.cc | 14 ++--- .../editors/space_action/action_select.cc | 2 +- .../blender/editors/space_image/image_ops.cc | 2 +- .../editors/space_image/space_image.cc | 2 +- .../blender/editors/space_nla/nla_buttons.cc | 4 +- .../space_outliner/tree/tree_element_pose.cc | 4 +- .../editors/space_sequencer/sequencer_edit.cc | 2 +- .../space_sequencer/sequencer_intern.hh | 2 +- .../space_sequencer/space_sequencer.cc | 8 ++- .../editors/space_text/text_autocomplete.cc | 2 +- .../editors/space_view3d/view3d_buttons.cc | 2 +- .../view3d_navigate_smoothview.cc | 2 +- .../editors/space_view3d/view3d_project.cc | 4 +- .../editors/space_view3d/view3d_select.cc | 2 +- .../transform/transform_constraints.cc | 8 +-- .../transform/transform_convert_armature.cc | 6 +- .../transform/transform_mode_edge_slide.cc | 2 +- .../transform/transform_mode_timeslide.cc | 2 +- source/blender/editors/uvedit/uvedit_ops.cc | 8 +-- .../blender/editors/uvedit/uvedit_select.cc | 2 +- .../intern/scene_graph/NodeGroup.cpp | 4 +- .../freestyle/intern/view_map/Functions0D.h | 2 +- .../intern/view_map/ViewEdgeXBuilder.cpp | 5 +- source/blender/geometry/intern/uv_pack.cc | 4 +- .../geometry/intern/uv_parametrizer.cc | 4 +- .../blender/gpu/intern/gpu_uniform_buffer.cc | 2 +- .../blender/gpu/intern/gpu_vertex_format.cc | 2 +- source/blender/gpu/metal/mtl_memory.mm | 2 +- .../blender/gpu/metal/mtl_shader_generator.hh | 2 +- source/blender/gpu/metal/mtl_texture.hh | 6 +- .../blender/imbuf/intern/cineon/cineonlib.cc | 2 +- .../blender/io/collada/AnimationImporter.cpp | 2 +- source/blender/io/collada/AnimationImporter.h | 2 +- .../blender/io/collada/BCAnimationSampler.cpp | 2 +- .../blender/io/collada/DocumentImporter.cpp | 4 +- source/blender/io/collada/MeshImporter.cpp | 2 +- source/blender/io/collada/SkinInfo.h | 2 +- source/blender/makesdna/DNA_object_types.h | 2 +- source/blender/makesdna/DNA_sequence_types.h | 4 +- source/blender/makesdna/DNA_sound_types.h | 2 +- source/blender/makesdna/intern/makesdna.cc | 2 +- source/blender/makesrna/intern/makesrna.cc | 2 +- source/blender/makesrna/intern/rna_access.cc | 14 ++--- .../blender/makesrna/intern/rna_animation.cc | 2 +- .../blender/makesrna/intern/rna_armature.cc | 12 ++-- source/blender/makesrna/intern/rna_cloth.cc | 2 +- source/blender/makesrna/intern/rna_define.cc | 2 +- source/blender/makesrna/intern/rna_fcurve.cc | 2 +- .../blender/makesrna/intern/rna_fcurve_api.cc | 4 +- source/blender/makesrna/intern/rna_image.cc | 2 +- source/blender/makesrna/intern/rna_mesh.cc | 4 +- .../blender/makesrna/intern/rna_movieclip.cc | 2 +- source/blender/makesrna/intern/rna_object.cc | 4 +- .../blender/makesrna/intern/rna_particle.cc | 30 +++++---- source/blender/makesrna/intern/rna_pose.cc | 4 +- source/blender/makesrna/intern/rna_rna.cc | 2 +- source/blender/makesrna/intern/rna_scene.cc | 2 +- source/blender/makesrna/intern/rna_wm.cc | 8 +-- source/blender/python/generic/bgl.cc | 38 ++++++------ source/blender/sequencer/intern/effects.cc | 3 +- .../simulation/intern/SIM_mass_spring.cc | 6 +- 119 files changed, 296 insertions(+), 278 deletions(-) diff --git a/intern/cycles/bvh/build.cpp b/intern/cycles/bvh/build.cpp index 5288eb51f95..50802fde867 100644 --- a/intern/cycles/bvh/build.cpp +++ b/intern/cycles/bvh/build.cpp @@ -814,14 +814,14 @@ BVHNode *BVHBuild::build_node(const BVHRange &range, BVHMixedSplit unaligned_split; float unalignedSplitSAH = FLT_MAX; - /* float unalignedLeafSAH = FLT_MAX; */ + // float unalignedLeafSAH = FLT_MAX; Transform aligned_space; bool do_unalinged_split = false; if (params.use_unaligned_nodes && splitSAH > params.unaligned_split_threshold * leafSAH) { aligned_space = unaligned_heuristic.compute_aligned_space(range, &references.at(0)); unaligned_split = BVHMixedSplit( this, storage, range, references, level, &unaligned_heuristic, &aligned_space); - /* unalignedLeafSAH = params.sah_primitive_cost * split.leafSAH; */ + // unalignedLeafSAH = params.sah_primitive_cost * split.leafSAH; unalignedSplitSAH = params.sah_node_cost * unaligned_split.bounds.half_area() + params.sah_primitive_cost * unaligned_split.nodeSAH; /* TODO(sergey): Check we can create leaf already. */ diff --git a/intern/cycles/kernel/sample/mapping.h b/intern/cycles/kernel/sample/mapping.h index 3b5683eb1b2..846ccd5ad15 100644 --- a/intern/cycles/kernel/sample/mapping.h +++ b/intern/cycles/kernel/sample/mapping.h @@ -128,10 +128,10 @@ ccl_device_inline float3 sample_uniform_cone(const float3 N, float2 xy = sample_uniform_disk(rand); const float r2 = len_squared(xy); - /* Equivalent to `mix(cos_angle, 1.0f, 1.0f - r2)` */ + /* Equivalent to `mix(cos_angle, 1.0f, 1.0f - r2)`. */ *cos_theta = 1.0f - r2 * one_minus_cos_angle; - /* Remap disk radius to cone radius, equivalent to `xy *= sin_theta / sqrt(r2); */ + /* Remap disk radius to cone radius, equivalent to `xy *= sin_theta / sqrt(r2)`. */ xy *= safe_sqrtf(one_minus_cos_angle * (2.0f - one_minus_cos_angle * r2)); *pdf = M_1_2PI_F / one_minus_cos_angle; diff --git a/intern/cycles/kernel/util/differential.h b/intern/cycles/kernel/util/differential.h index 3e914a532ec..55f440cc694 100644 --- a/intern/cycles/kernel/util/differential.h +++ b/intern/cycles/kernel/util/differential.h @@ -69,8 +69,8 @@ ccl_device void differential_dudv(ccl_private differential *du, * and the same for dudy and dvdy. the denominator is the same for both * solutions, so we compute it only once. * - * dP.dx = dPdu * dudx + dPdv * dvdx; - * dP.dy = dPdu * dudy + dPdv * dvdy; */ + * `dP.dx = dPdu * dudx + dPdv * dvdx;` + * `dP.dy = dPdu * dudy + dPdv * dvdy;` */ float det = (dPdu.x * dPdv.y - dPdv.x * dPdu.y); diff --git a/intern/cycles/util/system.cpp b/intern/cycles/util/system.cpp index c37a9db7eda..0af0d1fad4e 100644 --- a/intern/cycles/util/system.cpp +++ b/intern/cycles/util/system.cpp @@ -155,7 +155,7 @@ static CPUCapabilities &system_cpu_capabilities() const bool ssse3 = (result[2] & ((int)1 << 9)) != 0; const bool sse41 = (result[2] & ((int)1 << 19)) != 0; - /* const bool sse42 = (result[2] & ((int)1 << 20)) != 0; */ + // const bool sse42 = (result[2] & ((int)1 << 20)) != 0; const bool fma3 = (result[2] & ((int)1 << 12)) != 0; const bool os_uses_xsave_xrestore = (result[2] & ((int)1 << 27)) != 0; diff --git a/source/blender/blenkernel/BKE_cloth.hh b/source/blender/blenkernel/BKE_cloth.hh index d02f813d535..ef63b03bcff 100644 --- a/source/blender/blenkernel/BKE_cloth.hh +++ b/source/blender/blenkernel/BKE_cloth.hh @@ -121,7 +121,7 @@ struct ClothVertex { struct ClothSpring { int ij; /* `Pij` from the paper, one end of the spring. */ int kl; /* `Pkl` from the paper, one end of the spring. */ - int mn; /* For hair springs: third vertex index; For bending springs: edge index; */ + int mn; /* For hair springs: third vertex index; For bending springs: edge index. */ int *pa; /* Array of vert indices for poly a (for bending springs). */ int *pb; /* Array of vert indices for poly b (for bending springs). */ int la; /* Length of `*pa`. */ diff --git a/source/blender/blenkernel/intern/CCGSubSurf_intern.h b/source/blender/blenkernel/intern/CCGSubSurf_intern.h index 2b211ec9f28..6b5b6378f14 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf_intern.h +++ b/source/blender/blenkernel/intern/CCGSubSurf_intern.h @@ -110,8 +110,8 @@ struct CCGVert { CCGEdge **edges; CCGFace **faces; - /* byte *levelData; */ - /* byte *user_data; */ + // byte *levelData; + // byte *user_data; }; struct CCGEdge { @@ -124,8 +124,8 @@ struct CCGEdge { CCGVert *v0, *v1; CCGFace **faces; - /* byte *levelData; */ - /* byte *user_data; */ + // byte *levelData; + // byte *user_data; }; struct CCGFace { @@ -135,11 +135,11 @@ struct CCGFace { short numVerts, flags; int osd_index; - /* CCGVert **verts; */ - /* CCGEdge **edges; */ - /* byte *centerData; */ - /* byte **gridData; */ - /* byte *user_data; */ + // CCGVert **verts; + // CCGEdge **edges; + // byte *centerData; + // byte **gridData; + // byte *user_data; }; typedef enum { diff --git a/source/blender/blenkernel/intern/colortools.cc b/source/blender/blenkernel/intern/colortools.cc index 1db0feacb59..6358aa23ad6 100644 --- a/source/blender/blenkernel/intern/colortools.cc +++ b/source/blender/blenkernel/intern/colortools.cc @@ -1406,7 +1406,7 @@ void BKE_histogram_update_sample_line(Histogram *hist, hist->channels = 3; hist->x_resolution = 256; hist->xmax = 1.0f; - /* hist->ymax = 1.0f; */ /* now do this on the operator _only_ */ + // hist->ymax = 1.0f; /* now do this on the operator _only_ */ if (ibuf->byte_buffer.data == nullptr && ibuf->float_buffer.data == nullptr) { return; diff --git a/source/blender/blenkernel/intern/constraint.cc b/source/blender/blenkernel/intern/constraint.cc index 43183eeaa94..f0cf28ce7b2 100644 --- a/source/blender/blenkernel/intern/constraint.cc +++ b/source/blender/blenkernel/intern/constraint.cc @@ -5459,37 +5459,37 @@ static short CTI_INIT = 1; /* when non-zero, the list needs to be updated */ /* This function only gets called when CTI_INIT is non-zero */ static void constraints_init_typeinfo() { - constraintsTypeInfo[0] = nullptr; /* 'Null' Constraint */ - constraintsTypeInfo[1] = &CTI_CHILDOF; /* ChildOf Constraint */ - constraintsTypeInfo[2] = &CTI_TRACKTO; /* TrackTo Constraint */ - constraintsTypeInfo[3] = &CTI_KINEMATIC; /* IK Constraint */ - constraintsTypeInfo[4] = &CTI_FOLLOWPATH; /* Follow-Path Constraint */ - constraintsTypeInfo[5] = &CTI_ROTLIMIT; /* Limit Rotation Constraint */ - constraintsTypeInfo[6] = &CTI_LOCLIMIT; /* Limit Location Constraint */ - constraintsTypeInfo[7] = &CTI_SIZELIMIT; /* Limit Scale Constraint */ - constraintsTypeInfo[8] = &CTI_ROTLIKE; /* Copy Rotation Constraint */ - constraintsTypeInfo[9] = &CTI_LOCLIKE; /* Copy Location Constraint */ - constraintsTypeInfo[10] = &CTI_SIZELIKE; /* Copy Scale Constraint */ - constraintsTypeInfo[11] = &CTI_PYTHON; /* Python/Script Constraint */ - constraintsTypeInfo[12] = &CTI_ACTION; /* Action Constraint */ - constraintsTypeInfo[13] = &CTI_LOCKTRACK; /* Locked-Track Constraint */ - constraintsTypeInfo[14] = &CTI_DISTLIMIT; /* Limit Distance Constraint */ - constraintsTypeInfo[15] = &CTI_STRETCHTO; /* StretchTo Constraint */ - constraintsTypeInfo[16] = &CTI_MINMAX; /* Floor Constraint */ - /* constraintsTypeInfo[17] = &CTI_RIGIDBODYJOINT; */ /* RigidBody Constraint - Deprecated */ - constraintsTypeInfo[18] = &CTI_CLAMPTO; /* ClampTo Constraint */ - constraintsTypeInfo[19] = &CTI_TRANSFORM; /* Transformation Constraint */ - constraintsTypeInfo[20] = &CTI_SHRINKWRAP; /* Shrinkwrap Constraint */ - constraintsTypeInfo[21] = &CTI_DAMPTRACK; /* Damped TrackTo Constraint */ - constraintsTypeInfo[22] = &CTI_SPLINEIK; /* Spline IK Constraint */ - constraintsTypeInfo[23] = &CTI_TRANSLIKE; /* Copy Transforms Constraint */ - constraintsTypeInfo[24] = &CTI_SAMEVOL; /* Maintain Volume Constraint */ - constraintsTypeInfo[25] = &CTI_PIVOT; /* Pivot Constraint */ - constraintsTypeInfo[26] = &CTI_FOLLOWTRACK; /* Follow Track Constraint */ - constraintsTypeInfo[27] = &CTI_CAMERASOLVER; /* Camera Solver Constraint */ - constraintsTypeInfo[28] = &CTI_OBJECTSOLVER; /* Object Solver Constraint */ - constraintsTypeInfo[29] = &CTI_TRANSFORM_CACHE; /* Transform Cache Constraint */ - constraintsTypeInfo[30] = &CTI_ARMATURE; /* Armature Constraint */ + constraintsTypeInfo[0] = nullptr; /* 'Null' Constraint */ + constraintsTypeInfo[1] = &CTI_CHILDOF; /* ChildOf Constraint */ + constraintsTypeInfo[2] = &CTI_TRACKTO; /* TrackTo Constraint */ + constraintsTypeInfo[3] = &CTI_KINEMATIC; /* IK Constraint */ + constraintsTypeInfo[4] = &CTI_FOLLOWPATH; /* Follow-Path Constraint */ + constraintsTypeInfo[5] = &CTI_ROTLIMIT; /* Limit Rotation Constraint */ + constraintsTypeInfo[6] = &CTI_LOCLIMIT; /* Limit Location Constraint */ + constraintsTypeInfo[7] = &CTI_SIZELIMIT; /* Limit Scale Constraint */ + constraintsTypeInfo[8] = &CTI_ROTLIKE; /* Copy Rotation Constraint */ + constraintsTypeInfo[9] = &CTI_LOCLIKE; /* Copy Location Constraint */ + constraintsTypeInfo[10] = &CTI_SIZELIKE; /* Copy Scale Constraint */ + constraintsTypeInfo[11] = &CTI_PYTHON; /* Python/Script Constraint */ + constraintsTypeInfo[12] = &CTI_ACTION; /* Action Constraint */ + constraintsTypeInfo[13] = &CTI_LOCKTRACK; /* Locked-Track Constraint */ + constraintsTypeInfo[14] = &CTI_DISTLIMIT; /* Limit Distance Constraint */ + constraintsTypeInfo[15] = &CTI_STRETCHTO; /* StretchTo Constraint */ + constraintsTypeInfo[16] = &CTI_MINMAX; /* Floor Constraint */ + constraintsTypeInfo[17] = nullptr; /* RigidBody Constraint: DEPRECATED. */ + constraintsTypeInfo[18] = &CTI_CLAMPTO; /* ClampTo Constraint */ + constraintsTypeInfo[19] = &CTI_TRANSFORM; /* Transformation Constraint */ + constraintsTypeInfo[20] = &CTI_SHRINKWRAP; /* Shrinkwrap Constraint */ + constraintsTypeInfo[21] = &CTI_DAMPTRACK; /* Damped TrackTo Constraint */ + constraintsTypeInfo[22] = &CTI_SPLINEIK; /* Spline IK Constraint */ + constraintsTypeInfo[23] = &CTI_TRANSLIKE; /* Copy Transforms Constraint */ + constraintsTypeInfo[24] = &CTI_SAMEVOL; /* Maintain Volume Constraint */ + constraintsTypeInfo[25] = &CTI_PIVOT; /* Pivot Constraint */ + constraintsTypeInfo[26] = &CTI_FOLLOWTRACK; /* Follow Track Constraint */ + constraintsTypeInfo[27] = &CTI_CAMERASOLVER; /* Camera Solver Constraint */ + constraintsTypeInfo[28] = &CTI_OBJECTSOLVER; /* Object Solver Constraint */ + constraintsTypeInfo[29] = &CTI_TRANSFORM_CACHE; /* Transform Cache Constraint */ + constraintsTypeInfo[30] = &CTI_ARMATURE; /* Armature Constraint */ } const bConstraintTypeInfo *BKE_constraint_typeinfo_from_type(int type) diff --git a/source/blender/blenkernel/intern/curve.cc b/source/blender/blenkernel/intern/curve.cc index eb8b60a1408..f967deeea67 100644 --- a/source/blender/blenkernel/intern/curve.cc +++ b/source/blender/blenkernel/intern/curve.cc @@ -2154,8 +2154,8 @@ static void bevel_list_smooth(BevList *bl, int smooth_iter) nr = bl->nr; if (bl->poly == -1) { /* check its not cyclic */ - /* skip the first point */ - /* bevp0 = bevp1; */ + /* Skip the first point. */ + // bevp0 = bevp1; bevp1 = bevp2; bevp2++; nr--; @@ -2184,7 +2184,7 @@ static void bevel_list_smooth(BevList *bl, int smooth_iter) interp_qt_qtqt(bevp1->quat, bevp1->quat, q, 0.5); normalize_qt(bevp1->quat); - /* bevp0 = bevp1; */ /* UNUSED */ + // bevp0 = bevp1; /* UNUSED */ bevp1 = bevp2; bevp2++; } @@ -2385,7 +2385,7 @@ static void make_bevel_list_3D_tangent(BevList *bl) normalize_v3(cross_tmp); tri_to_quat(bevp1->quat, zero, cross_tmp, bevp1->tan); /* XXX: could be faster. */ - /* bevp0 = bevp1; */ /* UNUSED */ + // bevp0 = bevp1; /* UNUSED */ bevp1 = bevp2; bevp2++; } diff --git a/source/blender/blenkernel/intern/ipo.cc b/source/blender/blenkernel/intern/ipo.cc index 648e2e53358..e3ab81a6a38 100644 --- a/source/blender/blenkernel/intern/ipo.cc +++ b/source/blender/blenkernel/intern/ipo.cc @@ -1609,7 +1609,7 @@ static void icu_to_fcurves(ID *id, if (((icu->blocktype == ID_OB) && ELEM(icu->adrcode, OB_ROT_X, OB_ROT_Y, OB_ROT_Z)) || ((icu->blocktype == ID_PO) && ELEM(icu->adrcode, AC_EUL_X, AC_EUL_Y, AC_EUL_Z))) { - const float fac = float(M_PI) / 18.0f; /* 10.0f * M_PI/180.0f; */ + const float fac = float(M_PI) / 18.0f; /* `10.0f * M_PI/180.0f`. */ dst->vec[0][1] *= fac; dst->vec[1][1] *= fac; diff --git a/source/blender/blenkernel/intern/key.cc b/source/blender/blenkernel/intern/key.cc index af565301067..070f8721102 100644 --- a/source/blender/blenkernel/intern/key.cc +++ b/source/blender/blenkernel/intern/key.cc @@ -461,7 +461,11 @@ static int setkeys(float fac, ListBase *lb, KeyBlock *k[], float t[4], int cycl) k1 = k[0] = k[1] = k[2] = k[3] = firstkey; t[0] = t[1] = t[2] = t[3] = k1->pos; - /* if (fac < 0.0 || fac > 1.0) return 1; */ +#if 0 + if (fac < 0.0 || fac > 1.0) { + return 1; + } +#endif if (k1->next == nullptr) { return 1; @@ -479,7 +483,7 @@ static int setkeys(float fac, ListBase *lb, KeyBlock *k[], float t[4], int cycl) } k1 = k1->next; } - /* k1 = k[1]; */ /* UNUSED */ + // k1 = k[1]; /* UNUSED */ t[0] = k[0]->pos; t[1] += dpos; t[2] = k[2]->pos + dpos; diff --git a/source/blender/blenkernel/intern/mask.cc b/source/blender/blenkernel/intern/mask.cc index 89acecac576..da1363bd553 100644 --- a/source/blender/blenkernel/intern/mask.cc +++ b/source/blender/blenkernel/intern/mask.cc @@ -1830,7 +1830,7 @@ void BKE_mask_layer_shape_changed_add(MaskLayer *masklay, const int pi_next = (spline_point_index + 1) % spline->tot_point; const int index_offset = index - spline_point_index; - /* const int pi_curr_abs = index; */ + // const int pi_curr_abs = index; const int pi_prev_abs = pi_prev + index_offset; const int pi_next_abs = pi_next + index_offset; diff --git a/source/blender/blenkernel/intern/mask_evaluate.cc b/source/blender/blenkernel/intern/mask_evaluate.cc index 27631a06832..dcdcfc9aa36 100644 --- a/source/blender/blenkernel/intern/mask_evaluate.cc +++ b/source/blender/blenkernel/intern/mask_evaluate.cc @@ -517,16 +517,16 @@ static float ( point_curr = point_prev + 1; while (a--) { - /* BezTriple *bezt_prev; */ /* UNUSED */ - /* BezTriple *bezt_curr; */ /* UNUSED */ + // BezTriple *bezt_prev; /* UNUSED */ + // BezTriple *bezt_curr; /* UNUSED */ int j; if (a == 0 && (spline->flag & MASK_SPLINE_CYCLIC)) { point_curr = points_array; } - /* bezt_prev = &point_prev->bezt; */ - /* bezt_curr = &point_curr->bezt; */ + // bezt_prev = &point_prev->bezt; + // bezt_curr = &point_curr->bezt; for (j = 0; j < resol; j++, fp++) { float u = float(j) / resol, weight; diff --git a/source/blender/blenkernel/intern/mask_rasterize.cc b/source/blender/blenkernel/intern/mask_rasterize.cc index 12d1e10b67e..a9eb71d5872 100644 --- a/source/blender/blenkernel/intern/mask_rasterize.cc +++ b/source/blender/blenkernel/intern/mask_rasterize.cc @@ -279,11 +279,11 @@ static void maskrasterize_spline_differentiate_point_outset(float (*diff_feather for (k = 0; k < tot_diff_point; k++) { - /* co_prev = diff_points[k_prev]; */ /* precalc */ + // co_prev = diff_points[k_prev]; /* Precalculate. */ co_curr = diff_points[k_curr]; co_next = diff_points[k_next]; - // sub_v2_v2v2(d_prev, co_prev, co_curr); /* precalc */ + // sub_v2_v2v2(d_prev, co_prev, co_curr); /* Precalculate. */ sub_v2_v2v2(d_next, co_curr, co_next); // normalize_v2(d_prev); /* precalc */ @@ -303,7 +303,7 @@ static void maskrasterize_spline_differentiate_point_outset(float (*diff_feather /* use next iter */ copy_v2_v2(d_prev, d_next); - /* k_prev = k_curr; */ /* precalc */ + // k_prev = k_curr; /* Precalculate. */ k_curr = k_next; k_next++; } diff --git a/source/blender/blenkernel/intern/packedFile.cc b/source/blender/blenkernel/intern/packedFile.cc index 96b434f8888..186e514565a 100644 --- a/source/blender/blenkernel/intern/packedFile.cc +++ b/source/blender/blenkernel/intern/packedFile.cc @@ -308,7 +308,7 @@ int BKE_packedfile_write_to_file(ReportList *reports, bool remove_tmp = false; char filepath[FILE_MAX]; char filepath_temp[FILE_MAX]; - /* void *data; */ + // void *data; STRNCPY(filepath, filepath_rel); BLI_path_abs(filepath, ref_file_name); diff --git a/source/blender/blenkernel/intern/particle_distribute.cc b/source/blender/blenkernel/intern/particle_distribute.cc index d7a56fd23b3..a320c77b425 100644 --- a/source/blender/blenkernel/intern/particle_distribute.cc +++ b/source/blender/blenkernel/intern/particle_distribute.cc @@ -741,7 +741,7 @@ static void distribute_children_exec(ParticleTask *thread, ChildParticle *cpa, i maxw = BLI_kdtree_3d_find_nearest_n(ctx->tree, orco1, ptn, 3); maxd = ptn[maxw - 1].dist; - /* mind=ptn[0].dist; */ /* UNUSED */ + // mind=ptn[0].dist; /* UNUSED */ /* the weights here could be done better */ for (w = 0; w < maxw; w++) { diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.cc b/source/blender/blenkernel/intern/pbvh_bmesh.cc index 6f6c0b06fd9..eaf8ecb9b78 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.cc +++ b/source/blender/blenkernel/intern/pbvh_bmesh.cc @@ -1189,7 +1189,7 @@ static void pbvh_bmesh_split_edge(EdgeQueueContext *eq_ctx, v_tri[0] = v_new; v_tri[1] = v2; - /* v_tri[2] = v_opp; */ /* unchanged */ + // v_tri[2] = v_opp; /* Unchanged. */ e_tri[0] = BM_edge_create(pbvh->header.bm, v_tri[0], v_tri[1], nullptr, BM_CREATE_NO_DOUBLE); e_tri[2] = e_tri[1]; /* switched */ e_tri[1] = BM_edge_create(pbvh->header.bm, v_tri[1], v_tri[2], nullptr, BM_CREATE_NO_DOUBLE); diff --git a/source/blender/blenkernel/intern/pointcache.cc b/source/blender/blenkernel/intern/pointcache.cc index ccaee4e8002..808c413a96b 100644 --- a/source/blender/blenkernel/intern/pointcache.cc +++ b/source/blender/blenkernel/intern/pointcache.cc @@ -2780,7 +2780,7 @@ bool BKE_ptcache_id_exist(PTCacheID *pid, int cfra) void BKE_ptcache_id_time( PTCacheID *pid, Scene *scene, float cfra, int *startframe, int *endframe, float *timescale) { - /* Object *ob; */ /* UNUSED */ + // Object *ob; /* UNUSED */ PointCache *cache; /* float offset; unused for now */ float time, nexttime; diff --git a/source/blender/blenkernel/intern/sound.cc b/source/blender/blenkernel/intern/sound.cc index bc7184f88ea..240bb05c86a 100644 --- a/source/blender/blenkernel/intern/sound.cc +++ b/source/blender/blenkernel/intern/sound.cc @@ -259,7 +259,7 @@ bSound *BKE_sound_new_file(Main *bmain, const char *filepath) sound = static_cast(BKE_libblock_alloc(bmain, ID_SO, BLI_path_basename(filepath), 0)); STRNCPY(sound->filepath, filepath); - /* sound->type = SOUND_TYPE_FILE; */ /* XXX unused currently */ + // sound->type = SOUND_TYPE_FILE; /* UNUSED. */ /* Extract sound specs for bSound */ SoundInfo info; diff --git a/source/blender/blenkernel/intern/subsurf_ccg.cc b/source/blender/blenkernel/intern/subsurf_ccg.cc index 8d51e2e6fc9..03ce72a4762 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.cc +++ b/source/blender/blenkernel/intern/subsurf_ccg.cc @@ -990,7 +990,7 @@ static void ccgDM_copyFinalPolyArray(DerivedMesh *dm, int *r_face_offsets) int index; int totface; int gridSize = ccgSubSurf_getGridSize(ss); - /* int edgeSize = ccgSubSurf_getEdgeSize(ss); */ /* UNUSED */ + // int edgeSize = ccgSubSurf_getEdgeSize(ss); /* UNUSED. */ int i = 0, k = 0; totface = ccgSubSurf_getNumFaces(ss); diff --git a/source/blender/blenkernel/intern/text.cc b/source/blender/blenkernel/intern/text.cc index 83c0bd94761..cfacdc83e29 100644 --- a/source/blender/blenkernel/intern/text.cc +++ b/source/blender/blenkernel/intern/text.cc @@ -408,7 +408,7 @@ static void text_from_buf(Text *text, const uchar *buffer, const int len) cleanup_textline(tmp); BLI_addtail(&text->lines, tmp); - /* lines_count += 1; */ /* UNUSED */ + // lines_count += 1; /* UNUSED. */ } text->curl = text->sell = static_cast(text->lines.first); @@ -2221,7 +2221,7 @@ int txt_setcurr_tab_spaces(Text *text, int space) } while (text->curl->line[i] == indent) { - /* We only count those tabs/spaces that are before any text or before the curs; */ + /* We only count those tabs/spaces that are before any text or before the `curs`. */ if (i == text->curc) { return i; } diff --git a/source/blender/blenkernel/intern/vfontdata_freetype.cc b/source/blender/blenkernel/intern/vfontdata_freetype.cc index 451aa4caa68..39b98e9003a 100644 --- a/source/blender/blenkernel/intern/vfontdata_freetype.cc +++ b/source/blender/blenkernel/intern/vfontdata_freetype.cc @@ -354,11 +354,11 @@ VChar *BKE_vfontdata_char_from_freetypefont(VFont *vfont, ulong character) return nullptr; } - /* Init Freetype */ + /* Initialize Freetype. */ FT_Library library = nullptr; FT_Error err = FT_Init_FreeType(&library); if (err) { - /* XXX error("Failed to load the Freetype font library"); */ + // error("Failed to load the Freetype font library"); return nullptr; } diff --git a/source/blender/blenlib/BLI_math_quaternion.hh b/source/blender/blenlib/BLI_math_quaternion.hh index 1f6a4f7fb62..7b28bc5ddb1 100644 --- a/source/blender/blenlib/BLI_math_quaternion.hh +++ b/source/blender/blenlib/BLI_math_quaternion.hh @@ -317,15 +317,15 @@ template QuaternionBase R = q * V * conjugate(q); return {R.x, R.y, R.z}; #else - /* `S = q * V` */ + /* `S = q * V`. */ QuaternionBase S; S.w = /* q.w * 0.0 */ -q.x * v.x - q.y * v.y - q.z * v.z; S.x = q.w * v.x /* + q.x * 0.0 */ + q.y * v.z - q.z * v.y; S.y = q.w * v.y /* + q.y * 0.0 */ + q.z * v.x - q.x * v.z; S.z = q.w * v.z /* + q.z * 0.0 */ + q.x * v.y - q.y * v.x; - /* `R = S * conjugate(q)` */ + /* `R = S * conjugate(q)`. */ VecBase R; - /* R.w = S.w * q.w + S.x * q.x + S.y * q.y + S.z * q.z = 0.0; */ + /* `R.w = S.w * q.w + S.x * q.x + S.y * q.y + S.z * q.z = 0.0`. */ R.x = S.w * -q.x + S.x * q.w - S.y * q.z + S.z * q.y; R.y = S.w * -q.y + S.y * q.w - S.z * q.x + S.x * q.z; R.z = S.w * -q.z + S.z * q.w - S.x * q.y + S.y * q.x; diff --git a/source/blender/blenlib/BLI_smallhash.h b/source/blender/blenlib/BLI_smallhash.h index f6ef00e75ad..947631f8d9e 100644 --- a/source/blender/blenlib/BLI_smallhash.h +++ b/source/blender/blenlib/BLI_smallhash.h @@ -68,7 +68,7 @@ void *BLI_smallhash_iternew(const SmallHash *sh, SmallHashIter *iter, uintptr_t ATTR_NONNULL(1) ATTR_WARN_UNUSED_RESULT; void **BLI_smallhash_iternew_p(const SmallHash *sh, SmallHashIter *iter, uintptr_t *key) ATTR_NONNULL(1) ATTR_WARN_UNUSED_RESULT; -/* void BLI_smallhash_print(SmallHash *sh); */ /* UNUSED */ +// void BLI_smallhash_print(SmallHash *sh); /* UNUSED. */ #ifdef DEBUG /** diff --git a/source/blender/blenlib/intern/array_utils.c b/source/blender/blenlib/intern/array_utils.c index 047374baaa0..20abcfe3b80 100644 --- a/source/blender/blenlib/intern/array_utils.c +++ b/source/blender/blenlib/intern/array_utils.c @@ -327,9 +327,9 @@ bool _bli_array_iter_spiral_square(const void *arr_v, bool check_bounds = steps > steps_in; - /* sign: 0 neg; 1 pos; */ + /* Sign: 0=negative 1=positive. */ for (int sign = 2; sign--;) { - /* axis: 0 x; 1 y; */ + /* Axis: 0=x; 1=y. */ for (int axis = 2; axis--;) { int ofs_step = stride[axis]; if (!sign) { diff --git a/source/blender/blenlib/intern/math_geom.c b/source/blender/blenlib/intern/math_geom.c index 7e026c3c4c0..93839a6b65b 100644 --- a/source/blender/blenlib/intern/math_geom.c +++ b/source/blender/blenlib/intern/math_geom.c @@ -5251,9 +5251,9 @@ void vcloud_estimate_transform_v3(const int list_size, /* build 'projection' matrix */ for (a = 0; a < list_size; a++) { sub_v3_v3v3(va, rpos[a], accu_rcom); - /* mul_v3_fl(va, bp->mass); mass needs re-normalization here ?? */ + // mul_v3_fl(va, bp->mass); /* Mass needs re-normalization here? */ sub_v3_v3v3(vb, pos[a], accu_com); - /* mul_v3_fl(va, rp->mass); */ + // mul_v3_fl(va, rp->mass); m[0][0] += va[0] * vb[0]; m[0][1] += va[0] * vb[1]; m[0][2] += va[0] * vb[2]; diff --git a/source/blender/blenlib/intern/scanfill.c b/source/blender/blenlib/intern/scanfill.c index 758b6adfbe2..e6cfa32a05c 100644 --- a/source/blender/blenlib/intern/scanfill.c +++ b/source/blender/blenlib/intern/scanfill.c @@ -513,7 +513,11 @@ static uint scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int flag) sc->vert = eve; sc->edge_first = sc->edge_last = NULL; /* NOTE: debug print only will work for curve poly-fill, union is in use for mesh. */ - /* if (even->tmp.v == NULL) eve->tmp.u = verts; */ +#if 0 + if (even->tmp.v == NULL) { + eve->tmp.u = verts; + } +#endif sc++; } } @@ -613,9 +617,13 @@ static uint scanfill(ScanFillContext *sf_ctx, PolyFill *pf, const int flag) ed1 = sc->edge_first; ed2 = ed1->next; - /* commented out... the ESC here delivers corrupted memory + /* Commented out: the ESC here delivers corrupted memory * (and doesn't work during grab). */ - /* if (callLocalInterruptCallBack()) break; */ +#if 0 + if (callLocalInterruptCallBack()){ + break; + } +#endif if (totface >= maxface) { // printf("Fill error: endless loop. Escaped at vert %d, tot: %d.\n", a, verts); a = verts; @@ -1094,8 +1102,11 @@ uint BLI_scanfill_calc_ex(ScanFillContext *sf_ctx, const int flag, const float n *pc = c; pc++; } - /* only for optimize! */ - /* else if (pf->max_xy[0] < (pflist+c)->min[cox]) break; */ +#if 0 + else if (pf->max_xy[0] < (pflist + c)->min[cox]) { /* Only for optimize! */ + break; + } +#endif } while (pc != polycache) { pc--; diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index abdce4a792c..e04c5b9b98a 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -2270,7 +2270,7 @@ static void direct_link_library(FileData *fd, Library *lib, Main *main) lib->filepath_abs); change_link_placeholder_to_real_ID_pointer(fd->mainlist, fd, lib, newmain->curlib); - /* change_link_placeholder_to_real_ID_pointer_fd(fd, lib, newmain->curlib); */ + // change_link_placeholder_to_real_ID_pointer_fd(fd, lib, newmain->curlib); BLI_remlink(&main->libraries, lib); MEM_freeN(lib); diff --git a/source/blender/bmesh/intern/bmesh_core.cc b/source/blender/bmesh/intern/bmesh_core.cc index 4cf96e98128..c78226c4169 100644 --- a/source/blender/bmesh/intern/bmesh_core.cc +++ b/source/blender/bmesh/intern/bmesh_core.cc @@ -1853,7 +1853,7 @@ BMVert *bmesh_kernel_join_vert_kill_edge(BMesh *bm, BM_CHECK_ELEMENT(v_target); if (v_target->e && v_kill->e) { - /* inline BM_vert_splice(bm, v_target, v_kill); */ + /* Inline `BM_vert_splice(bm, v_target, v_kill)`. */ BMEdge *e; while ((e = v_kill->e)) { BMEdge *e_target; diff --git a/source/blender/bmesh/intern/bmesh_edgeloop.cc b/source/blender/bmesh/intern/bmesh_edgeloop.cc index 6bcffd244ea..9490f92bacf 100644 --- a/source/blender/bmesh/intern/bmesh_edgeloop.cc +++ b/source/blender/bmesh/intern/bmesh_edgeloop.cc @@ -251,7 +251,7 @@ static bool bm_loop_path_build_step(BLI_mempool *vs_pool, } /* Commented because used in a loop, and this flag has already been set. */ - /* bm->elem_index_dirty |= BM_VERT; */ + // bm->elem_index_dirty |= BM_VERT; /* lb is now full of free'd items, overwrite */ *lb = lb_tmp; diff --git a/source/blender/bmesh/intern/bmesh_iterators_inline.h b/source/blender/bmesh/intern/bmesh_iterators_inline.h index 191499c46b0..86fa0706706 100644 --- a/source/blender/bmesh/intern/bmesh_iterators_inline.h +++ b/source/blender/bmesh/intern/bmesh_iterators_inline.h @@ -37,7 +37,7 @@ ATTR_WARN_UNUSED_RESULT ATTR_NONNULL(1) BLI_INLINE void *BM_iter_step(BMIter *it ATTR_NONNULL(1) BLI_INLINE bool BM_iter_init(BMIter *iter, BMesh *bm, const char itype, void *data) { - /* int argtype; */ + // int argtype; iter->itype = itype; /* inlining optimizes out this switch when called with the defined type */ diff --git a/source/blender/bmesh/intern/bmesh_mods.cc b/source/blender/bmesh/intern/bmesh_mods.cc index 5b16903e915..ecdf6c16457 100644 --- a/source/blender/bmesh/intern/bmesh_mods.cc +++ b/source/blender/bmesh/intern/bmesh_mods.cc @@ -395,7 +395,7 @@ BMEdge *BM_vert_collapse_faces(BMesh *bm, e_new = bmesh_kernel_join_edge_kill_vert( bm, e_kill, v_kill, do_del, true, kill_degenerate_faces, kill_duplicate_faces); - /* e_new = BM_edge_exists(tv, tv2); */ /* same as return above */ + // e_new = BM_edge_exists(tv, tv2); /* Same as return above. */ } return e_new; diff --git a/source/blender/bmesh/operators/bmo_dissolve.cc b/source/blender/bmesh/operators/bmo_dissolve.cc index 96a3a703bc4..1be07bb0c27 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.cc +++ b/source/blender/bmesh/operators/bmo_dissolve.cc @@ -264,7 +264,7 @@ void bmo_dissolve_faces_exec(BMesh *bm, BMOperator *op) void bmo_dissolve_edges_exec(BMesh *bm, BMOperator *op) { - /* BMOperator fop; */ + // BMOperator fop; BMFace *act_face = bm->act_face; BMOIter eiter; BMIter iter; diff --git a/source/blender/bmesh/operators/bmo_mesh_convert.cc b/source/blender/bmesh/operators/bmo_mesh_convert.cc index d879f9dcdd8..3199a09422e 100644 --- a/source/blender/bmesh/operators/bmo_mesh_convert.cc +++ b/source/blender/bmesh/operators/bmo_mesh_convert.cc @@ -38,7 +38,7 @@ void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op) void bmo_object_load_bmesh_exec(BMesh *bm, BMOperator *op) { Object *ob = static_cast(BMO_slot_ptr_get(op->slots_in, "object")); - /* Scene *scene = BMO_slot_ptr_get(op, "scene"); */ + // Scene *scene = BMO_slot_ptr_get(op, "scene"); Mesh *me = static_cast(ob->data); BMO_op_callf(bm, op->flag, "bmesh_to_mesh mesh=%p object=%p", me, ob); @@ -47,7 +47,7 @@ void bmo_object_load_bmesh_exec(BMesh *bm, BMOperator *op) void bmo_bmesh_to_mesh_exec(BMesh *bm, BMOperator *op) { Mesh *me = static_cast(BMO_slot_ptr_get(op->slots_in, "mesh")); - /* Object *ob = BMO_slot_ptr_get(op, "object"); */ + // Object *ob = BMO_slot_ptr_get(op, "object"); BMeshToMeshParams params{}; params.calc_object_remap = true; diff --git a/source/blender/bmesh/operators/bmo_subdivide.cc b/source/blender/bmesh/operators/bmo_subdivide.cc index 95ea275a103..a8c1c5bc11a 100644 --- a/source/blender/bmesh/operators/bmo_subdivide.cc +++ b/source/blender/bmesh/operators/bmo_subdivide.cc @@ -36,8 +36,8 @@ struct SubDParams { bool use_fractal; int seed; BMOperator *op; - BMOpSlot *slot_edge_percents; /* BMO_slot_get(params->op->slots_in, "edge_percents"); */ - BMOpSlot *slot_custom_patterns; /* BMO_slot_get(params->op->slots_in, "custom_patterns"); */ + BMOpSlot *slot_edge_percents; /* `BMO_slot_get(params->op->slots_in, "edge_percents")`. */ + BMOpSlot *slot_custom_patterns; /* `BMO_slot_get(params->op->slots_in, "custom_patterns")`. */ float fractal_ofs[3]; /* Runtime storage for shape key. */ @@ -601,9 +601,9 @@ static void quad_2edge_split_fan(BMesh *bm, const SubDParams *params) { BMFace *f_new; - /* BMVert *v; */ /* UNUSED */ - /* BMVert *v_last = verts[2]; */ /* UNUSED */ - /* BMEdge *e, *e_new; */ /* UNUSED */ + // BMVert *v; /* UNUSED */ + // BMVert *v_last = verts[2]; /* UNUSED */ + // BMEdge *e, *e_new; /* UNUSED */ int i, numcuts = params->numcuts; for (i = 0; i < numcuts; i++) { diff --git a/source/blender/bmesh/operators/bmo_triangulate.cc b/source/blender/bmesh/operators/bmo_triangulate.cc index 4438964559a..4f288ef522a 100644 --- a/source/blender/bmesh/operators/bmo_triangulate.cc +++ b/source/blender/bmesh/operators/bmo_triangulate.cc @@ -54,7 +54,7 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op) BMOIter siter; BMEdge *e; ScanFillContext sf_ctx; - /* ScanFillEdge *sf_edge; */ /* UNUSED */ + // ScanFillEdge *sf_edge; /* UNUSED */ GHash *sf_vert_map; float normal[3]; const int scanfill_flag = BLI_SCANFILL_CALC_HOLES | BLI_SCANFILL_CALC_POLYS | @@ -88,7 +88,7 @@ void bmo_triangle_fill_exec(BMesh *bm, BMOperator *op) } /* sf_edge = */ BLI_scanfill_edge_add(&sf_ctx, UNPACK2(sf_verts)); - /* sf_edge->tmp.p = e; */ /* UNUSED */ + // sf_edge->tmp.p = e; /* UNUSED */ } nors_tot = BLI_ghash_len(sf_vert_map); BLI_ghash_free(sf_vert_map, nullptr, nullptr); diff --git a/source/blender/bmesh/tools/bmesh_bevel.cc b/source/blender/bmesh/tools/bmesh_bevel.cc index eb8dd263efb..9cd864cb295 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.cc +++ b/source/blender/bmesh/tools/bmesh_bevel.cc @@ -5731,7 +5731,7 @@ static void bevel_build_cutoff(BevelParams *bp, BMesh *bm, BevVert *bv) } /* Create the profile cutoff face for this boundvert. */ - /* repface = boundvert_rep_face(bndv, nullptr); */ + // repface = boundvert_rep_face(bndv, nullptr); bev_create_ngon(bm, face_bmverts, bp->seg + 2 + build_center_face, diff --git a/source/blender/compositor/operations/COM_ChannelMatteOperation.h b/source/blender/compositor/operations/COM_ChannelMatteOperation.h index ceaf6404ed7..6c0f5e89d3d 100644 --- a/source/blender/compositor/operations/COM_ChannelMatteOperation.h +++ b/source/blender/compositor/operations/COM_ChannelMatteOperation.h @@ -16,12 +16,12 @@ class ChannelMatteOperation : public MultiThreadedOperation { private: SocketReader *input_image_program_; - /* int color_space_; */ /* node->custom1 */ /* UNUSED */ /* TODO ? */ - int matte_channel_; /* node->custom2 */ - int limit_method_; /* node->algorithm */ - int limit_channel_; /* node->channel */ - float limit_max_; /* node->storage->t1 */ - float limit_min_; /* node->storage->t2 */ + // int color_space_; /* node->custom1 */ /* UNUSED */ /* TODO? */ + int matte_channel_; /* node->custom2 */ + int limit_method_; /* node->algorithm */ + int limit_channel_; /* node->channel */ + float limit_max_; /* node->storage->t1 */ + float limit_min_; /* node->storage->t2 */ float limit_range_; diff --git a/source/blender/compositor/operations/COM_MovieDistortionOperation.cc b/source/blender/compositor/operations/COM_MovieDistortionOperation.cc index e060a1ae886..09236bb910a 100644 --- a/source/blender/compositor/operations/COM_MovieDistortionOperation.cc +++ b/source/blender/compositor/operations/COM_MovieDistortionOperation.cc @@ -91,7 +91,7 @@ void MovieDistortionOperation::execute_pixel_sampled(float output[4], return; } - /* float overscan = 0.0f; */ + // float overscan = 0.0f; const float w = float(width) /* / (1 + overscan) */; const float h = float(height) /* / (1 + overscan) */; const float pixel_aspect = pixel_aspect_; diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.cc b/source/blender/draw/engines/eevee/eevee_lightcache.cc index c7098f2ac72..73cef28bb7f 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.cc +++ b/source/blender/draw/engines/eevee/eevee_lightcache.cc @@ -787,7 +787,7 @@ wmJob *EEVEE_lightbake_job_create(wmWindowManager *wm, MEM_callocN(sizeof(EEVEE_LightBake), "EEVEE_LightBake")); /* Cannot reuse depsgraph for now because we cannot get the update from the * main database directly. TODO: reuse depsgraph and only update positions. */ - /* lbake->depsgraph = old_lbake->depsgraph; */ + // lbake->depsgraph = old_lbake->depsgraph; lbake->depsgraph = DEG_graph_new(bmain, scene, view_layer, DAG_EVAL_RENDER); lbake->mutex = BLI_mutex_alloc(); diff --git a/source/blender/draw/engines/eevee_next/eevee_shadow.cc b/source/blender/draw/engines/eevee_next/eevee_shadow.cc index f7b064754cb..9d447b73abd 100644 --- a/source/blender/draw/engines/eevee_next/eevee_shadow.cc +++ b/source/blender/draw/engines/eevee_next/eevee_shadow.cc @@ -1160,7 +1160,7 @@ float ShadowModule::tilemap_pixel_radius() /* Update all shadow regions visible inside the view. * If called multiple time for the same view, it will only do the depth buffer scanning * to check any new opaque surfaces. - * Needs to be called after LightModule::set_view(); */ + * Needs to be called after `LightModule::set_view();`. */ void ShadowModule::set_view(View &view) { GPUFrameBuffer *prev_fb = GPU_framebuffer_active_get(); diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_camera_lib.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_camera_lib.glsl index 93eb8d9dc51..60324da6b7a 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_camera_lib.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_camera_lib.glsl @@ -116,7 +116,7 @@ vec3 camera_view_from_uv(CameraData cam, vec2 uv) vV = camera_equirectangular_to_direction(cam, uv); break; case CAMERA_PANO_EQUIDISTANT: - /* ATTR_FALLTHROUGH; */ + // ATTR_FALLTHROUGH; case CAMERA_PANO_EQUISOLID: vV = camera_fisheye_to_direction(cam, uv); break; @@ -138,7 +138,7 @@ vec2 camera_uv_from_view(CameraData cam, vec3 vV) case CAMERA_PANO_EQUIRECT: return camera_equirectangular_from_direction(cam, vV); case CAMERA_PANO_EQUISOLID: - /* ATTR_FALLTHROUGH; */ + // ATTR_FALLTHROUGH; case CAMERA_PANO_EQUIDISTANT: return camera_fisheye_from_direction(cam, vV); case CAMERA_PANO_MIRROR: diff --git a/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_lib.glsl b/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_lib.glsl index 59395c3ece0..be037207826 100644 --- a/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_lib.glsl +++ b/source/blender/draw/engines/eevee_next/shaders/eevee_shadow_lib.glsl @@ -23,8 +23,8 @@ vec2 shadow_page_uv_transform( /* Rotate vector to light's local space . Used for directional shadows. */ vec3 shadow_world_to_local(LightData ld, vec3 L) { - /* Avoid relying on compiler to optimize this. - * vec3 lL = transpose(mat3(ld.object_mat)) * L; */ + /* Avoid relying on compiler to optimize this. */ + // vec3 lL = transpose(mat3(ld.object_mat)) * L; vec3 lL; lL.x = dot(ld.object_mat[0].xyz, L); lL.y = dot(ld.object_mat[1].xyz, L); diff --git a/source/blender/draw/engines/overlay/overlay_armature.cc b/source/blender/draw/engines/overlay/overlay_armature.cc index e8b55a78bb7..13080de5919 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.cc +++ b/source/blender/draw/engines/overlay/overlay_armature.cc @@ -61,7 +61,7 @@ enum eArmatureDrawMode { struct ArmatureDrawContext { /* Current armature object */ Object *ob; - /* bArmature *arm; */ /* TODO */ + // bArmature *arm; /* TODO. */ eArmatureDrawMode draw_mode; eArmature_Drawtype drawtype; diff --git a/source/blender/editors/animation/anim_channels_defines.cc b/source/blender/editors/animation/anim_channels_defines.cc index 192015f1232..48ef37f1585 100644 --- a/source/blender/editors/animation/anim_channels_defines.cc +++ b/source/blender/editors/animation/anim_channels_defines.cc @@ -5089,7 +5089,7 @@ static void achannel_setting_slider_shapekey_cb(bContext *C, void *key_poin, voi /* callback for NLA Control Curve widget sliders - insert keyframes */ static void achannel_setting_slider_nla_curve_cb(bContext *C, void * /*id_poin*/, void *fcu_poin) { - /* ID *id = (ID *)id_poin; */ + // ID *id = (ID *)id_poin; FCurve *fcu = (FCurve *)fcu_poin; PointerRNA ptr; diff --git a/source/blender/editors/curve/editcurve.cc b/source/blender/editors/curve/editcurve.cc index ecf1fe29027..b002868522a 100644 --- a/source/blender/editors/curve/editcurve.cc +++ b/source/blender/editors/curve/editcurve.cc @@ -4667,7 +4667,7 @@ static int make_segment_exec(bContext *C, wmOperator *op) MEM_freeN(nu1->bp); nu1->bp = bp; - /* a = nu1->pntsu + nu1->orderu; */ /* UNUSED */ + // a = nu1->pntsu + nu1->orderu; /* UNUSED */ nu1->pntsu += nu2->pntsu; BLI_remlink(nubase, nu2); diff --git a/source/blender/editors/curve/editfont.cc b/source/blender/editors/curve/editfont.cc index 1f1a699999a..91b52887683 100644 --- a/source/blender/editors/curve/editfont.cc +++ b/source/blender/editors/curve/editfont.cc @@ -478,7 +478,6 @@ static void font_select_update_primary_clipboard(Object *obedit) /** \name Generic Paste Functions * \{ */ -/* text_update_edited(C, scene, obedit, 1, FO_EDIT); */ static bool font_paste_wchar(Object *obedit, const char32_t *str, const size_t str_len, diff --git a/source/blender/editors/gpencil_legacy/annotate_paint.cc b/source/blender/editors/gpencil_legacy/annotate_paint.cc index 327d18ef441..ea9aa4fec06 100644 --- a/source/blender/editors/gpencil_legacy/annotate_paint.cc +++ b/source/blender/editors/gpencil_legacy/annotate_paint.cc @@ -1294,8 +1294,8 @@ static bool annotation_session_initdata(bContext *C, tGPsdata *p) switch (curarea->spacetype) { /* supported views first */ case SPACE_VIEW3D: { - /* View3D *v3d = curarea->spacedata.first; */ - /* RegionView3D *rv3d = region->regiondata; */ + // View3D *v3d = curarea->spacedata.first; + // RegionView3D *rv3d = region->regiondata; /* set current area * - must verify that region data is 3D-view (and not something else) @@ -1312,7 +1312,7 @@ static bool annotation_session_initdata(bContext *C, tGPsdata *p) break; } case SPACE_NODE: { - /* SpaceNode *snode = curarea->spacedata.first; */ + // SpaceNode *snode = curarea->spacedata.first; /* set current area */ p->area = curarea; @@ -1338,7 +1338,7 @@ static bool annotation_session_initdata(bContext *C, tGPsdata *p) break; } case SPACE_IMAGE: { - /* SpaceImage *sima = curarea->spacedata.first; */ + // SpaceImage *sima = curarea->spacedata.first; /* set the current area */ p->area = curarea; diff --git a/source/blender/editors/interface/interface_handlers.cc b/source/blender/editors/interface/interface_handlers.cc index 3df7210c9a3..4cfdb4a05f9 100644 --- a/source/blender/editors/interface/interface_handlers.cc +++ b/source/blender/editors/interface/interface_handlers.cc @@ -4987,8 +4987,8 @@ static float ui_numedit_apply_snapf( if (fac != 1.0f) { /* snap in unit-space */ tempf /= fac; - /* softmin /= fac; */ /* UNUSED */ - /* softmax /= fac; */ /* UNUSED */ + // softmin /= fac; /* UNUSED */ + // softmax /= fac; /* UNUSED */ softrange /= fac; } diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc index 23f2c8f42fe..39640c03856 100644 --- a/source/blender/editors/interface/interface_layout.cc +++ b/source/blender/editors/interface/interface_layout.cc @@ -614,7 +614,7 @@ static void ui_item_array(uiLayout *layout, } w /= dim_size[0]; - /* h /= dim_size[1]; */ /* UNUSED */ + // h /= dim_size[1]; /* UNUSED */ for (int a = 0; a < len; a++) { col = a % dim_size[0]; @@ -3750,7 +3750,7 @@ static void ui_litem_layout_row(uiLayout *litem) int freew, fixedx, freex, flag = 0, lastw = 0; float extra_pixel; - /* x = litem->x; */ /* UNUSED */ + // x = litem->x; /* UNUSED */ const int y = litem->y; int w = litem->w; int totw = 0; diff --git a/source/blender/editors/interface/interface_region_menu_pie.cc b/source/blender/editors/interface/interface_region_menu_pie.cc index dd4b59490a6..1aa06ee3709 100644 --- a/source/blender/editors/interface/interface_region_menu_pie.cc +++ b/source/blender/editors/interface/interface_region_menu_pie.cc @@ -100,7 +100,7 @@ uiPieMenu *UI_pie_menu_begin(bContext *C, const char *title, int icon, const wmE pie->block_radial = UI_block_begin(C, nullptr, __func__, UI_EMBOSS); /* may be useful later to allow spawning pies * from old positions */ - /* pie->block_radial->flag |= UI_BLOCK_POPUP_MEMORY; */ + // pie->block_radial->flag |= UI_BLOCK_POPUP_MEMORY; pie->block_radial->puphash = ui_popup_menu_hash(title); pie->block_radial->flag |= UI_BLOCK_RADIAL; diff --git a/source/blender/editors/interface/view2d.cc b/source/blender/editors/interface/view2d.cc index 5c92b248eef..d3c09777acd 100644 --- a/source/blender/editors/interface/view2d.cc +++ b/source/blender/editors/interface/view2d.cc @@ -538,7 +538,7 @@ static void ui_view2d_curRect_validate_resize(View2D *v2d, bool resize) } } do_cur = do_x; - /* do_win = do_y; */ /* UNUSED */ + // do_win = do_y; /* UNUSED. */ if (do_cur) { if ((v2d->keeptot == V2D_KEEPTOT_STRICT) && (winx != v2d->oldwinx)) { diff --git a/source/blender/editors/mask/mask_draw.cc b/source/blender/editors/mask/mask_draw.cc index 730dcb0a279..6e5ab8c6509 100644 --- a/source/blender/editors/mask/mask_draw.cc +++ b/source/blender/editors/mask/mask_draw.cc @@ -665,10 +665,10 @@ void ED_mask_draw_region( const float width = width_i, height = float(height_i) * (aspy / aspx); int x, y; - /* int w, h; */ + // int w, h; float zoomx, zoomy; - /* frame image */ + /* Frame image. */ float maxdim; float xofs, yofs; diff --git a/source/blender/editors/mesh/editmesh_knife.cc b/source/blender/editors/mesh/editmesh_knife.cc index 3ab9ad32d29..01fb3b41c3e 100644 --- a/source/blender/editors/mesh/editmesh_knife.cc +++ b/source/blender/editors/mesh/editmesh_knife.cc @@ -3849,7 +3849,7 @@ static void knife_constrain_axis(KnifeTool_OpData *kcd) mul_m3_m3_pre(co, mat); for (int i = 0; i <= 2; i++) { if ((kcd->constrain_axis - 1) != i) { - /* kcd->curr_cage_adjusted[i] = prev_cage_adjusted[i]; */ + // kcd->curr_cage_adjusted[i] = prev_cage_adjusted[i]; co[2][i] = co[0][i]; } } diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc index 2df1ee5ccf6..dc67b6768a6 100644 --- a/source/blender/editors/object/object_add.cc +++ b/source/blender/editors/object/object_add.cc @@ -373,7 +373,7 @@ float ED_object_new_primitive_matrix(bContext *C, return dia; } - /* return 1.0f; */ + // return 1.0f; } /** \} */ diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc index 1840331386f..8140eb5025a 100644 --- a/source/blender/editors/object/object_modifier.cc +++ b/source/blender/editors/object/object_modifier.cc @@ -2468,7 +2468,7 @@ void OBJECT_OT_multires_external_save(wmOperatorType *ot) ot->description = "Save displacements to an external file"; ot->idname = "OBJECT_OT_multires_external_save"; - /* XXX modifier no longer in context after file browser .. ot->poll = multires_poll; */ + /* XXX modifier no longer in context after file browser: `ot->poll = multires_poll;`. */ ot->exec = multires_external_save_exec; ot->invoke = multires_external_save_invoke; ot->poll = multires_poll; diff --git a/source/blender/editors/object/object_relations.cc b/source/blender/editors/object/object_relations.cc index e966534bb40..aca7d0a72a6 100644 --- a/source/blender/editors/object/object_relations.cc +++ b/source/blender/editors/object/object_relations.cc @@ -627,8 +627,8 @@ bool ED_object_parent_set(ReportList *reports, * NOTE: the old (2.4x) method was to set ob->partype = PARSKEL, * creating the * virtual modifiers. */ - ob->partype = PAROBJECT; /* NOTE: DNA define, not operator property. */ - /* ob->partype = PARSKEL; */ /* NOTE: DNA define, not operator property. */ + ob->partype = PAROBJECT; /* NOTE: DNA define, not operator property. */ + // ob->partype = PARSKEL; /* NOTE: DNA define, not operator property. */ /* BUT, to keep the deforms, we need a modifier, * and then we need to set the object * that it uses diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc index 6957c5d0550..1cf6545d095 100644 --- a/source/blender/editors/object/object_transform.cc +++ b/source/blender/editors/object/object_transform.cc @@ -1540,7 +1540,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *op) tot_change++; arm->id.tag |= LIB_TAG_DOIT; - /* do_inverse_offset = true; */ /* docenter_armature() handles this */ + // do_inverse_offset = true; /* docenter_armature() handles this. */ Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); BKE_object_transform_copy(ob_eval, ob); diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc index dbee98b0b2a..17b99f96928 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc @@ -988,12 +988,12 @@ static int line_isect_y(const float p1[2], const float p2[2], const float y_leve } if (p1[1] > y_level && p2[1] < y_level) { - /* (p1[1] - p2[1]); */ + /* `p1[1] - p2[1]`. */ *x_isect = (p2[0] * (p1[1] - y_level) + p1[0] * (y_level - p2[1])) / y_diff; return ISECT_TRUE; } if (p1[1] < y_level && p2[1] > y_level) { - /* (p2[1] - p1[1]); */ + /* `p2[1] - p1[1]`. */ *x_isect = (p2[0] * (y_level - p1[1]) + p1[0] * (p2[1] - y_level)) / y_diff; return ISECT_TRUE; } @@ -1023,12 +1023,12 @@ static int line_isect_x(const float p1[2], const float p2[2], const float x_leve } if (p1[0] > x_level && p2[0] < x_level) { - /* (p1[0] - p2[0]); */ + /* `p1[0] - p2[0]`. */ *y_isect = (p2[1] * (p1[0] - x_level) + p1[1] * (x_level - p2[0])) / x_diff; return ISECT_TRUE; } if (p1[0] < x_level && p2[0] > x_level) { - /* (p2[0] - p1[0]); */ + /* `p2[0] - p1[0]`. */ *y_isect = (p2[1] * (x_level - p1[0]) + p1[1] * (p2[0] - x_level)) / x_diff; return ISECT_TRUE; } @@ -3088,9 +3088,9 @@ static void project_paint_face_init(const ProjPaintState *ps, lt_uv_pxoffset[2][1] = lt_tri_uv[2][1] - yhalfpx; { - uv1co = lt_uv_pxoffset[0]; /* was lt_tri_uv[i1]; */ - uv2co = lt_uv_pxoffset[1]; /* was lt_tri_uv[i2]; */ - uv3co = lt_uv_pxoffset[2]; /* was lt_tri_uv[i3]; */ + uv1co = lt_uv_pxoffset[0]; /* Was `lt_tri_uv[i1];`. */ + uv2co = lt_uv_pxoffset[1]; /* Was `lt_tri_uv[i2];`. */ + uv3co = lt_uv_pxoffset[2]; /* Was `lt_tri_uv[i3];`. */ v1coSS = ps->screenCoords[lt_vtri[0]]; v2coSS = ps->screenCoords[lt_vtri[1]]; diff --git a/source/blender/editors/space_action/action_select.cc b/source/blender/editors/space_action/action_select.cc index f3b3e7cef21..c774df308a9 100644 --- a/source/blender/editors/space_action/action_select.cc +++ b/source/blender/editors/space_action/action_select.cc @@ -2049,7 +2049,7 @@ static int actkeys_clickselect_exec(bContext *C, wmOperator *op) } /* get useful pointers from animation context data */ - /* region = ac.region; */ /* UNUSED */ + // region = ac.region; /* UNUSED. */ /* select mode is either replace (deselect all, then add) or add/extend */ const short selectmode = RNA_boolean_get(op->ptr, "extend") ? SELECT_INVERT : SELECT_REPLACE; diff --git a/source/blender/editors/space_image/image_ops.cc b/source/blender/editors/space_image/image_ops.cc index 1f11a86d07c..d8d9686e840 100644 --- a/source/blender/editors/space_image/image_ops.cc +++ b/source/blender/editors/space_image/image_ops.cc @@ -322,7 +322,7 @@ static void image_view_all(SpaceImage *sima, ARegion *region, wmOperator *op) bool space_image_main_region_poll(bContext *C) { SpaceImage *sima = CTX_wm_space_image(C); - /* XXX ARegion *region = CTX_wm_region(C); */ + // ARegion *region = CTX_wm_region(C); /* XXX. */ if (sima) { return true; /* XXX (region && region->type->regionid == RGN_TYPE_WINDOW); */ diff --git a/source/blender/editors/space_image/space_image.cc b/source/blender/editors/space_image/space_image.cc index b534cb40dfb..85486930cc7 100644 --- a/source/blender/editors/space_image/space_image.cc +++ b/source/blender/editors/space_image/space_image.cc @@ -448,7 +448,7 @@ static int /*eContextResult*/ image_context(const bContext *C, if (CTX_data_dir(member)) { CTX_data_dir_set(result, image_context_dir); - /* TODO(sybren): return CTX_RESULT_OK; */ + // return CTX_RESULT_OK; /* TODO(@sybren). */ } else if (CTX_data_equals(member, "edit_image")) { CTX_data_id_pointer_set(result, (ID *)ED_space_image(sima)); diff --git a/source/blender/editors/space_nla/nla_buttons.cc b/source/blender/editors/space_nla/nla_buttons.cc index fb24b089afa..21aaf67357d 100644 --- a/source/blender/editors/space_nla/nla_buttons.cc +++ b/source/blender/editors/space_nla/nla_buttons.cc @@ -265,7 +265,7 @@ static void nla_panel_animdata(const bContext *C, Panel *panel) { PointerRNA adt_ptr; PointerRNA strip_ptr; - /* AnimData *adt; */ + // AnimData *adt; uiLayout *layout = panel->layout; uiLayout *row; uiBlock *block; @@ -279,7 +279,7 @@ static void nla_panel_animdata(const bContext *C, Panel *panel) return; } - /* adt = adt_ptr.data; */ + // adt = adt_ptr.data; block = uiLayoutGetBlock(layout); UI_block_func_handle_set(block, do_nla_region_buttons, nullptr); diff --git a/source/blender/editors/space_outliner/tree/tree_element_pose.cc b/source/blender/editors/space_outliner/tree/tree_element_pose.cc index 13b6838f8df..f3316eb8726 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_pose.cc +++ b/source/blender/editors/space_outliner/tree/tree_element_pose.cc @@ -42,10 +42,10 @@ void TreeElementPoseBase::expand(SpaceOutliner & /*space_outliner*/) const pchan->temp = (void *)ten; if (!BLI_listbase_is_empty(&pchan->constraints)) { - /* Object *target; */ + // Object *target; TreeElement *tenla1 = add_element( &ten->subtree, &object_.id, nullptr, ten, TSE_CONSTRAINT_BASE, 0); - /* char *str; */ + // char *str; LISTBASE_FOREACH (bConstraint *, con, &pchan->constraints) { add_element(&tenla1->subtree, &object_.id, con, tenla1, TSE_CONSTRAINT, const_index); diff --git a/source/blender/editors/space_sequencer/sequencer_edit.cc b/source/blender/editors/space_sequencer/sequencer_edit.cc index 685389d3dc7..6b464dc45ee 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.cc +++ b/source/blender/editors/space_sequencer/sequencer_edit.cc @@ -82,7 +82,7 @@ struct TransSeq { int start, machine; int startofs, endofs; int anim_startofs, anim_endofs; - /* int final_left, final_right; */ /* UNUSED */ + // int final_left, final_right; /* UNUSED. */ int len; float content_start; }; diff --git a/source/blender/editors/space_sequencer/sequencer_intern.hh b/source/blender/editors/space_sequencer/sequencer_intern.hh index 5bc2fcb4973..f61ab30de30 100644 --- a/source/blender/editors/space_sequencer/sequencer_intern.hh +++ b/source/blender/editors/space_sequencer/sequencer_intern.hh @@ -139,7 +139,7 @@ bool sequencer_edit_poll(bContext *C); bool sequencer_edit_with_channel_region_poll(bContext *C); bool sequencer_editing_initialized_and_active(bContext *C); /* UNUSED */ -/* bool sequencer_strip_poll( bContext *C); */ +// bool sequencer_strip_poll( bContext *C); bool sequencer_strip_has_path_poll(bContext *C); bool sequencer_view_has_preview_poll(bContext *C); bool sequencer_view_preview_only_poll(const bContext *C); diff --git a/source/blender/editors/space_sequencer/space_sequencer.cc b/source/blender/editors/space_sequencer/space_sequencer.cc index 584b9df4cf2..5423a02a52d 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.cc +++ b/source/blender/editors/space_sequencer/space_sequencer.cc @@ -202,7 +202,11 @@ static void sequencer_free(SpaceLink *sl) SpaceSeq *sseq = (SpaceSeq *)sl; SequencerScopes *scopes = &sseq->scopes; - /* XXX if (sseq->gpd) BKE_gpencil_free_data(sseq->gpd); */ +#if 0 + if (sseq->gpd) { + BKE_gpencil_free_data(sseq->gpd); + } +#endif if (scopes->zebra_ibuf) { IMB_freeImBuf(scopes->zebra_ibuf); @@ -298,7 +302,7 @@ static SpaceLink *sequencer_duplicate(SpaceLink *sl) SpaceSeq *sseqn = static_cast(MEM_dupallocN(sl)); /* Clear or remove stuff from old. */ - /* XXX sseq->gpd = gpencil_data_duplicate(sseq->gpd, false); */ + // sseq->gpd = gpencil_data_duplicate(sseq->gpd, false); memset(&sseqn->scopes, 0, sizeof(sseqn->scopes)); memset(&sseqn->runtime, 0, sizeof(sseqn->runtime)); diff --git a/source/blender/editors/space_text/text_autocomplete.cc b/source/blender/editors/space_text/text_autocomplete.cc index f61ef73631b..c7aa0867445 100644 --- a/source/blender/editors/space_text/text_autocomplete.cc +++ b/source/blender/editors/space_text/text_autocomplete.cc @@ -54,7 +54,7 @@ bool text_do_suggest_select(SpaceText *st, ARegion *region, const int mval[2]) first = texttool_suggest_first(); last = texttool_suggest_last(); - /* sel = texttool_suggest_selected(); */ /* UNUSED */ + // sel = texttool_suggest_selected(); /* UNUSED. */ top = texttool_suggest_top(); if (!last || !first) { diff --git a/source/blender/editors/space_view3d/view3d_buttons.cc b/source/blender/editors/space_view3d/view3d_buttons.cc index 7c2d6f06e56..e2d50bcb39e 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.cc +++ b/source/blender/editors/space_view3d/view3d_buttons.cc @@ -1220,7 +1220,7 @@ static void v3d_editvertex_buts(uiLayout *layout, View3D *v3d, Object *ob, float } } - /* ED_undo_push(C, "Transform properties"); */ + // ED_undo_push(C, "Transform properties"); } } diff --git a/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc b/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc index e97845e08ca..00f0173f6e4 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_smoothview.cc @@ -219,7 +219,7 @@ void ED_view3d_smooth_view_ex( } sms.org_view = rv3d->view; - /* sms.to_camera = false; */ /* initialized to zero anyway */ + // sms.to_camera = false; /* Initialized to zero anyway. */ /* note on camera locking, this is a little confusing but works ok. * we may be changing the view 'as if' there is no active camera, but in fact diff --git a/source/blender/editors/space_view3d/view3d_project.cc b/source/blender/editors/space_view3d/view3d_project.cc index 0cb7d2b6786..1bc2994eb7a 100644 --- a/source/blender/editors/space_view3d/view3d_project.cc +++ b/source/blender/editors/space_view3d/view3d_project.cc @@ -40,7 +40,7 @@ void ED_view3d_project_float_v2_m4(const ARegion *region, copy_v3_v3(vec4, co); vec4[3] = 1.0; - /* r_co[0] = IS_CLIPPED; */ /* always overwritten */ + // r_co[0] = IS_CLIPPED; /* Always overwritten. */ mul_m4_v4(mat, vec4); @@ -62,7 +62,7 @@ void ED_view3d_project_float_v3_m4(const ARegion *region, copy_v3_v3(vec4, co); vec4[3] = 1.0; - /* r_co[0] = IS_CLIPPED; */ /* always overwritten */ + // r_co[0] = IS_CLIPPED; /* Always overwritten. */ mul_m4_v4(mat, vec4); diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc index 579ff7b74ac..de065b23157 100644 --- a/source/blender/editors/space_view3d/view3d_select.cc +++ b/source/blender/editors/space_view3d/view3d_select.cc @@ -4600,7 +4600,7 @@ static bool paint_vertsel_circle_select(ViewContext *vc, const bool use_zbuf = !XRAY_ENABLED(vc->v3d); Object *ob = vc->obact; Mesh *me = static_cast(ob->data); - /* CircleSelectUserData data = {nullptr}; */ /* UNUSED */ + // CircleSelectUserData data = {nullptr}; /* UNUSED. */ bool changed = false; if (SEL_OP_USE_PRE_DESELECT(sel_op)) { diff --git a/source/blender/editors/transform/transform_constraints.cc b/source/blender/editors/transform/transform_constraints.cc index 461653ceb63..bfdbb997f3d 100644 --- a/source/blender/editors/transform/transform_constraints.cc +++ b/source/blender/editors/transform/transform_constraints.cc @@ -114,8 +114,8 @@ void constraintNumInput(TransInfo *t, float vec[3]) if (dims == 2) { int axis = mode & (CON_AXIS0 | CON_AXIS1 | CON_AXIS2); if (axis == (CON_AXIS0 | CON_AXIS1)) { - /* vec[0] = vec[0]; */ /* same */ - /* vec[1] = vec[1]; */ /* same */ + // vec[0] = vec[0]; /* Same. */ + // vec[1] = vec[1]; /* Same. */ vec[2] = nval; } else if (axis == (CON_AXIS1 | CON_AXIS2)) { @@ -124,14 +124,14 @@ void constraintNumInput(TransInfo *t, float vec[3]) vec[0] = nval; } else if (axis == (CON_AXIS0 | CON_AXIS2)) { - /* vec[0] = vec[0]; */ /* same */ + // vec[0] = vec[0]; /* Same. */ vec[2] = vec[1]; vec[1] = nval; } } else if (dims == 1) { if (mode & CON_AXIS0) { - /* vec[0] = vec[0]; */ /* same */ + // vec[0] = vec[0]; /* Same. */ vec[1] = nval; vec[2] = nval; } diff --git a/source/blender/editors/transform/transform_convert_armature.cc b/source/blender/editors/transform/transform_convert_armature.cc index bc6d4862027..a110c308af6 100644 --- a/source/blender/editors/transform/transform_convert_armature.cc +++ b/source/blender/editors/transform/transform_convert_armature.cc @@ -1630,9 +1630,9 @@ static short apply_targetless_ik(Object *ob) mat3_to_size(parchan->size, smat); } - /* causes problems with some constraints (e.g. childof), so disable this */ - /* as it is IK shouldn't affect location directly */ - /* copy_v3_v3(parchan->loc, mat[3]); */ + /* Causes problems with some constraints (e.g. child-of), so disable this + * as it is IK shouldn't affect location directly. */ + // copy_v3_v3(parchan->loc, mat[3]); } } diff --git a/source/blender/editors/transform/transform_mode_edge_slide.cc b/source/blender/editors/transform/transform_mode_edge_slide.cc index fe4b7d69124..237599bb809 100644 --- a/source/blender/editors/transform/transform_mode_edge_slide.cc +++ b/source/blender/editors/transform/transform_mode_edge_slide.cc @@ -685,7 +685,7 @@ static EdgeSlideData *createEdgeSlideVerts_double_side(TransInfo *t, TransDataCo } } - /* !BM_edge_is_boundary(e); */ + /* Equivalent to `!BM_edge_is_boundary(e)`. */ if (l_b != l_a) { BMEdge *e_next = get_other_edge(v, e); if (e_next) { diff --git a/source/blender/editors/transform/transform_mode_timeslide.cc b/source/blender/editors/transform/transform_mode_timeslide.cc index ea939123b17..5ae6049b3cc 100644 --- a/source/blender/editors/transform/transform_mode_timeslide.cc +++ b/source/blender/editors/transform/transform_mode_timeslide.cc @@ -133,7 +133,7 @@ static void applyTimeSlide(TransInfo *t) /* t->values_final[0] stores cval[0], which is the current mouse-pointer location (in frames) */ /* XXX Need to be able to repeat this. */ - /* t->values_final[0] = cval[0]; */ /* UNUSED (reset again later). */ + // t->values_final[0] = cval[0]; /* UNUSED (reset again later). */ /* handle numeric-input stuff */ t->vec[0] = 2.0f * (cval[0] - sval[0]) / (maxx - minx); diff --git a/source/blender/editors/uvedit/uvedit_ops.cc b/source/blender/editors/uvedit/uvedit_ops.cc index 6843c74b5f5..3e01764bdd4 100644 --- a/source/blender/editors/uvedit/uvedit_ops.cc +++ b/source/blender/editors/uvedit/uvedit_ops.cc @@ -1520,7 +1520,7 @@ static int uv_reveal_exec(bContext *C, wmOperator *op) BM_ELEM_CD_SET_BOOL(l, offsets.select_vert, select); BM_ELEM_CD_SET_BOOL(l, offsets.select_edge, select); } - /* BM_face_select_set(em->bm, efa, true); */ + // BM_face_select_set(em->bm, efa, true); BM_elem_flag_enable(efa, BM_ELEM_TAG); } } @@ -1546,7 +1546,7 @@ static int uv_reveal_exec(bContext *C, wmOperator *op) BM_ELEM_CD_SET_BOOL(l, offsets.select_edge, select); } } - /* BM_face_select_set(em->bm, efa, true); */ + // BM_face_select_set(em->bm, efa, true); BM_elem_flag_enable(efa, BM_ELEM_TAG); } } @@ -1560,7 +1560,7 @@ static int uv_reveal_exec(bContext *C, wmOperator *op) BM_ELEM_CD_SET_BOOL(l, offsets.select_vert, select); BM_ELEM_CD_SET_BOOL(l, offsets.select_edge, select); } - /* BM_face_select_set(em->bm, efa, true); */ + // BM_face_select_set(em->bm, efa, true); BM_elem_flag_enable(efa, BM_ELEM_TAG); } } @@ -1573,7 +1573,7 @@ static int uv_reveal_exec(bContext *C, wmOperator *op) BM_ELEM_CD_SET_BOOL(l, offsets.select_vert, select); BM_ELEM_CD_SET_BOOL(l, offsets.select_edge, select); } - /* BM_face_select_set(em->bm, efa, true); */ + // BM_face_select_set(em->bm, efa, true); BM_elem_flag_enable(efa, BM_ELEM_TAG); } } diff --git a/source/blender/editors/uvedit/uvedit_select.cc b/source/blender/editors/uvedit/uvedit_select.cc index a5dc194873e..f7d15dc36ac 100644 --- a/source/blender/editors/uvedit/uvedit_select.cc +++ b/source/blender/editors/uvedit/uvedit_select.cc @@ -3273,7 +3273,7 @@ static void uv_select_flush_from_tag_sticky_loc_internal(const Scene *scene, if (efa_index != vlist_iter->face_index) { BMLoop *l_other; efa_vlist = BM_face_at_index(em->bm, vlist_iter->face_index); - /* tf_vlist = BM_ELEM_CD_GET_VOID_P(efa_vlist, cd_poly_tex_offset); */ /* UNUSED */ + // tf_vlist = BM_ELEM_CD_GET_VOID_P(efa_vlist, cd_poly_tex_offset); /* UNUSED */ l_other = static_cast( BM_iter_at_index(em->bm, BM_LOOPS_OF_FACE, efa_vlist, vlist_iter->loop_of_face_index)); diff --git a/source/blender/freestyle/intern/scene_graph/NodeGroup.cpp b/source/blender/freestyle/intern/scene_graph/NodeGroup.cpp index 0fd941d3bd4..ec5a896416e 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeGroup.cpp +++ b/source/blender/freestyle/intern/scene_graph/NodeGroup.cpp @@ -78,14 +78,14 @@ void NodeGroup::DetachChildren() void NodeGroup::DetachChild(Node *iChild) { - /* int found = 0; */ /* UNUSED */ + // int found = 0; /* UNUSED. */ vector::iterator node; for (node = _Children.begin(); node != _Children.end(); ++node) { if ((*node) == iChild) { (*node)->release(); _Children.erase(node); - /* found = 1; */ /* UNUSED */ + // found = 1; /* UNUSED. */ break; } } diff --git a/source/blender/freestyle/intern/view_map/Functions0D.h b/source/blender/freestyle/intern/view_map/Functions0D.h index 84bbbf1fdd9..8bfeb3a5f36 100644 --- a/source/blender/freestyle/intern/view_map/Functions0D.h +++ b/source/blender/freestyle/intern/view_map/Functions0D.h @@ -71,7 +71,7 @@ template class UnaryFunction0D { py_uf0D = nullptr; } - /** Destructor; */ + /** Destructor. */ virtual ~UnaryFunction0D() {} /** Returns the string "UnaryFunction0D" */ diff --git a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp index 42effb4fcff..580e17c67ba 100644 --- a/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.cpp @@ -52,7 +52,8 @@ void ViewEdgeXBuilder::BuildViewEdges(WXShape *iWShape, // Reinit structures Init(oVShape); - /* ViewEdge *vedge; */ /* UNUSED */ + // ViewEdge *vedge; /* UNUSED. */ + // Let us build the smooth stuff //---------------------------------------- // We parse all faces to find the ones that contain smooth edges @@ -222,7 +223,7 @@ ViewEdge *ViewEdgeXBuilder::BuildSharpViewEdge(const OWXEdge &iWEdge) // Find first edge: OWXEdge firstWEdge = iWEdge; - /* OWXEdge previousWEdge = firstWEdge; */ /* UNUSED */ + // OWXEdge previousWEdge = firstWEdge; /* UNUSED */ OWXEdge currentWEdge = firstWEdge; list edgesChain; #if 0 /* TK 02-Sep-2012 Experimental fix for incorrect view edge visibility. */ diff --git a/source/blender/geometry/intern/uv_pack.cc b/source/blender/geometry/intern/uv_pack.cc index 0bfd40a3347..6e151f12364 100644 --- a/source/blender/geometry/intern/uv_pack.cc +++ b/source/blender/geometry/intern/uv_pack.cc @@ -40,7 +40,7 @@ class uv_phi { float2 translation; float rotation; - /* bool reflect; */ + // bool reflect; }; uv_phi::uv_phi() : translation(-1.0f, -1.0f), rotation(0.0f) @@ -1358,7 +1358,7 @@ static uv_phi find_best_fit_for_island(const PackIsland *island, uv_phi phi; phi.rotation = DEG2RADF(angle_90_multiple * 90); - /* phi.reflect = reflect; */ + // phi.reflect = reflect; float matrix[2][2]; island->build_transformation(scale, phi.rotation, matrix); diff --git a/source/blender/geometry/intern/uv_parametrizer.cc b/source/blender/geometry/intern/uv_parametrizer.cc index a208a19e2e9..733617b43fc 100644 --- a/source/blender/geometry/intern/uv_parametrizer.cc +++ b/source/blender/geometry/intern/uv_parametrizer.cc @@ -2708,12 +2708,12 @@ static bool p_chart_abf_solve(PChart *chart) p_abf_compute_sines(&sys); /* iteration */ - /* lastnorm = 1e10; */ /* UNUSED */ + // lastnorm = 1e10; /* UNUSED. */ for (i = 0; i < ABF_MAX_ITER; i++) { float norm = p_abf_compute_gradient(&sys, chart); - /* lastnorm = norm; */ /* UNUSED */ + // lastnorm = norm; /* UNUSED. */ if (norm < limit) { break; diff --git a/source/blender/gpu/intern/gpu_uniform_buffer.cc b/source/blender/gpu/intern/gpu_uniform_buffer.cc index 3598eb96fac..1e0c8938db6 100644 --- a/source/blender/gpu/intern/gpu_uniform_buffer.cc +++ b/source/blender/gpu/intern/gpu_uniform_buffer.cc @@ -101,7 +101,7 @@ static void buffer_from_list_inputs_sort(ListBase *inputs) return; } - /* Creates a lookup table for the different types; */ + /* Creates a lookup table for the different types. */ LinkData *inputs_lookup[MAX_UBO_GPU_TYPE + 1] = {nullptr}; eGPUType cur_type = static_cast(MAX_UBO_GPU_TYPE + 1); diff --git a/source/blender/gpu/intern/gpu_vertex_format.cc b/source/blender/gpu/intern/gpu_vertex_format.cc index 9c232c9fa8d..2b0116ff0ca 100644 --- a/source/blender/gpu/intern/gpu_vertex_format.cc +++ b/source/blender/gpu/intern/gpu_vertex_format.cc @@ -258,7 +258,7 @@ void GPU_vertformat_safe_attr_name(const char *attr_name, char *r_safe_name, uin uint len = strlen(attr_name); if (len > 8) { - /* Start with the first 4 chars of the name; */ + /* Start with the first 4 chars of the name. */ for (int i = 0; i < 4; i++) { data[i] = attr_name[i]; } diff --git a/source/blender/gpu/metal/mtl_memory.mm b/source/blender/gpu/metal/mtl_memory.mm index d172bd0b4e6..f02b64f3674 100644 --- a/source/blender/gpu/metal/mtl_memory.mm +++ b/source/blender/gpu/metal/mtl_memory.mm @@ -457,7 +457,7 @@ void MTLBufferPool::insert_buffer_into_pool(MTLResourceOptions options, gpu::MTL * can reset this state. * TODO(Metal): Purgeability state does not update instantly, so this requires a deferral. */ BLI_assert(buffer->get_metal_buffer()); - /* buffer->metal_buffer); [buffer->metal_buffer setPurgeableState:MTLPurgeableStateVolatile]; */ + // buffer->metal_buffer); [buffer->metal_buffer setPurgeableState:MTLPurgeableStateVolatile]; std::multiset *pool = buffer_pools_.lookup(options); pool->insert(MTLBufferHandle(buffer)); diff --git a/source/blender/gpu/metal/mtl_shader_generator.hh b/source/blender/gpu/metal/mtl_shader_generator.hh index 2c3cbeac574..ed2c6de1e54 100644 --- a/source/blender/gpu/metal/mtl_shader_generator.hh +++ b/source/blender/gpu/metal/mtl_shader_generator.hh @@ -377,7 +377,7 @@ struct MSLFragmentOutputAttribute { using MSLFragmentTileInputAttribute = MSLFragmentOutputAttribute; struct MSLSharedMemoryBlock { - /* e.g. shared vec4 color_cache[cache_size][cache_size]; */ + /* e.g. `shared vec4 color_cache[cache_size][cache_size];`. */ std::string type_name; std::string varname; bool is_array; diff --git a/source/blender/gpu/metal/mtl_texture.hh b/source/blender/gpu/metal/mtl_texture.hh index c1e4bd747d6..a6b91374de0 100644 --- a/source/blender/gpu/metal/mtl_texture.hh +++ b/source/blender/gpu/metal/mtl_texture.hh @@ -578,19 +578,19 @@ inline MTLPixelFormat mtl_format_get_writeable_view_format(MTLPixelFormat format case MTLPixelFormatDepth32Float: return MTLPixelFormatR32Float; case MTLPixelFormatDepth32Float_Stencil8: - /* return MTLPixelFormatRG32Float; */ + // return MTLPixelFormatRG32Float; /* No alternative mirror format. This should not be used for * manual data upload */ return MTLPixelFormatInvalid; case MTLPixelFormatBGR10A2Unorm: - /* return MTLPixelFormatBGRA8Unorm; */ + // return MTLPixelFormatBGRA8Unorm; /* No alternative mirror format. This should not be used for * manual data upload */ return MTLPixelFormatInvalid; case MTLPixelFormatDepth24Unorm_Stencil8: /* No direct format, but we'll just mirror the bytes -- `Uint` * should ensure bytes are not re-normalized or manipulated */ - /* return MTLPixelFormatR32Uint; */ + // return MTLPixelFormatR32Uint; return MTLPixelFormatInvalid; default: return format; diff --git a/source/blender/imbuf/intern/cineon/cineonlib.cc b/source/blender/imbuf/intern/cineon/cineonlib.cc index 3d1feacfbe1..0e3d92bdc0e 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.cc +++ b/source/blender/imbuf/intern/cineon/cineonlib.cc @@ -356,7 +356,7 @@ LogImageFile *cineonCreate( { CineonMainHeader header; const char *shortFilename = nullptr; - /* uchar pad[6044]; */ + // uchar pad[6044]; LogImageFile *cineon = (LogImageFile *)MEM_mallocN(sizeof(LogImageFile), __func__); if (cineon == nullptr) { diff --git a/source/blender/io/collada/AnimationImporter.cpp b/source/blender/io/collada/AnimationImporter.cpp index ebe0066dc21..bea5a097115 100644 --- a/source/blender/io/collada/AnimationImporter.cpp +++ b/source/blender/io/collada/AnimationImporter.cpp @@ -1701,7 +1701,7 @@ Object *AnimationImporter::translate_animation_OLD( calc_joint_parent_mat_rest(par, nullptr, root, node); mul_m4_m4m4(temp, par, matfra); - /* evaluate_joint_world_transform_at_frame(temp, nullptr, node, fra); */ + // evaluate_joint_world_transform_at_frame(temp, nullptr, node, fra); /* calc special matrix */ mul_m4_series(mat, irest, temp, irest_dae, rest); diff --git a/source/blender/io/collada/AnimationImporter.h b/source/blender/io/collada/AnimationImporter.h index aa1621a68e1..4803d16d1fd 100644 --- a/source/blender/io/collada/AnimationImporter.h +++ b/source/blender/io/collada/AnimationImporter.h @@ -40,7 +40,7 @@ class ArmatureImporter; class AnimationImporterBase { public: - /* virtual void change_eul_to_quat(Object *ob, bAction *act) = 0; */ + // virtual void change_eul_to_quat(Object *ob, bAction *act) = 0; }; class AnimationImporter : private TransformReader, public AnimationImporterBase { diff --git a/source/blender/io/collada/BCAnimationSampler.cpp b/source/blender/io/collada/BCAnimationSampler.cpp index f6486eb3e0e..fd60ccad68c 100644 --- a/source/blender/io/collada/BCAnimationSampler.cpp +++ b/source/blender/io/collada/BCAnimationSampler.cpp @@ -476,7 +476,7 @@ void BCAnimationSampler::initialize_curves(BCAnimationCurveMap &curves, Object * if (ma) { action = bc_getSceneMaterialAction(ma); if (action) { - /* isMatAnim = true; */ + // isMatAnim = true; FCurve *fcu = (FCurve *)action->curves.first; for (; fcu; fcu = fcu->next) { BCCurveKey key(object_type, fcu->rna_path, fcu->array_index, a); diff --git a/source/blender/io/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp index 8e918241935..8d3ae22361c 100644 --- a/source/blender/io/collada/DocumentImporter.cpp +++ b/source/blender/io/collada/DocumentImporter.cpp @@ -651,7 +651,7 @@ std::vector *DocumentImporter::write_node(COLLADAFW::Node *node, } } - /* create_constraints(et,ob); */ + // create_constraints(et, ob); } for (Object *ob : *objects_done) { @@ -1091,7 +1091,7 @@ bool DocumentImporter::writeAnimationList(const COLLADAFW::AnimationList *animat return true; } - /* return true; */ + // return true; return anim_importer.write_animation_list(animationList); } diff --git a/source/blender/io/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp index 010771e7780..8176a112d48 100644 --- a/source/blender/io/collada/MeshImporter.cpp +++ b/source/blender/io/collada/MeshImporter.cpp @@ -572,7 +572,7 @@ void MeshImporter::read_lines(COLLADAFW::Mesh *mesh, Mesh *me) if (loose_edge_count > 0) { uint face_edge_count = me->totedge; - /* uint total_edge_count = loose_edge_count + face_edge_count; */ /* UNUSED */ + // uint total_edge_count = loose_edge_count + face_edge_count; /* UNUSED. */ mesh_add_edges(me, loose_edge_count); MutableSpan edges = me->edges_for_write(); diff --git a/source/blender/io/collada/SkinInfo.h b/source/blender/io/collada/SkinInfo.h index bf9128cc73a..67ac852431b 100644 --- a/source/blender/io/collada/SkinInfo.h +++ b/source/blender/io/collada/SkinInfo.h @@ -43,7 +43,7 @@ class SkinInfo { COLLADAFW::UIntValuesArray joints_per_vertex; COLLADAFW::UIntValuesArray weight_indices; COLLADAFW::IntValuesArray joint_indices; - /* COLLADAFW::FloatOrDoubleArray weights; */ + // COLLADAFW::FloatOrDoubleArray weights; std::vector weights; std::vector joint_data; /* index to this vector is joint index */ diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 4a6dc33a9f4..6e89c77dd7b 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -325,7 +325,7 @@ typedef struct Object { struct Object *proxy_from DNA_DEPRECATED; /** Old animation system, deprecated for 2.5. */ struct Ipo *ipo DNA_DEPRECATED; - /* struct Path *path; */ + // struct Path *path; struct bAction *action DNA_DEPRECATED; /* XXX deprecated... old animation system */ struct bAction *poselib DNA_DEPRECATED; /* Pre-Blender 3.0 pose library, deprecated in 3.5. */ /** Pose data, armature objects only. */ diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index a488203480e..e3a754f3a29 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -75,8 +75,8 @@ typedef struct StripColorBalance { float power[3]; int flag; char _pad[4]; - /* float exposure; */ - /* float saturation; */ + // float exposure; + // float saturation; } StripColorBalance; typedef struct StripProxy { diff --git a/source/blender/makesdna/DNA_sound_types.h b/source/blender/makesdna/DNA_sound_types.h index 705d4c1509d..734030f131a 100644 --- a/source/blender/makesdna/DNA_sound_types.h +++ b/source/blender/makesdna/DNA_sound_types.h @@ -73,7 +73,7 @@ typedef struct bSound { /** Spin-lock for asynchronous loading of sounds. */ void *spinlock; /* XXX unused currently (SOUND_TYPE_LIMITER) */ - /* float start, end; */ + // float start, end; /* Description of Audio channels, as of #eSoundChannels. */ int audio_channels; diff --git a/source/blender/makesdna/intern/makesdna.cc b/source/blender/makesdna/intern/makesdna.cc index a5cde1c1ca9..6058dc98299 100644 --- a/source/blender/makesdna/intern/makesdna.cc +++ b/source/blender/makesdna/intern/makesdna.cc @@ -1340,7 +1340,7 @@ static int make_structDNA(const char *base_directory, /* FOR DEBUG */ if (debugSDNA > 1) { int a, b; - /* short *elem; */ + // short *elem; short num_types; printf("names_len %d types_len %d structs_len %d\n", names_len, types_len, structs_len); diff --git a/source/blender/makesrna/intern/makesrna.cc b/source/blender/makesrna/intern/makesrna.cc index 172f9104f09..250dcb2d3d1 100644 --- a/source/blender/makesrna/intern/makesrna.cc +++ b/source/blender/makesrna/intern/makesrna.cc @@ -2374,7 +2374,7 @@ static void rna_def_property_funcs_header(FILE *f, StructRNA *srna, PropertyDefR } case PROP_POINTER: { fprintf(f, "PointerRNA %sget(PointerRNA *ptr);\n", func); - /*fprintf(f, "void %sset(PointerRNA *ptr, PointerRNA value);\n", func); */ + // fprintf(f, "void %sset(PointerRNA *ptr, PointerRNA value);\n", func); break; } case PROP_COLLECTION: { diff --git a/source/blender/makesrna/intern/rna_access.cc b/source/blender/makesrna/intern/rna_access.cc index 17e05282b44..4b5c644f8c9 100644 --- a/source/blender/makesrna/intern/rna_access.cc +++ b/source/blender/makesrna/intern/rna_access.cc @@ -791,7 +791,7 @@ bool RNA_struct_contains_property(PointerRNA *ptr, PropertyRNA *prop_test) iterprop = RNA_struct_iterator_property(ptr->type); RNA_PROP_BEGIN (ptr, itemptr, iterprop) { - /* PropertyRNA *prop = itemptr.data; */ + // PropertyRNA *prop = itemptr.data; if (prop_test == (PropertyRNA *)itemptr.data) { found = true; break; @@ -2799,7 +2799,7 @@ void RNA_property_int_set_array(PointerRNA *ptr, PropertyRNA *prop, const int *v IDPropertyTemplate val = {0}; IDProperty *group; - /* TODO: RNA_property_int_clamp_array(ptr, prop, &value); */ + // RNA_property_int_clamp_array(ptr, prop, &value); /* TODO. */ val.array.len = prop->totarraylength; val.array.type = IDP_INT; @@ -3183,7 +3183,7 @@ void RNA_property_float_set_array(PointerRNA *ptr, PropertyRNA *prop, const floa IDPropertyTemplate val = {0}; IDProperty *group; - /* TODO: RNA_property_float_clamp_array(ptr, prop, &value); */ + // RNA_property_float_clamp_array(ptr, prop, &value); /* TODO. */ val.array.len = prop->totarraylength; val.array.type = IDP_FLOAT; @@ -4006,7 +4006,7 @@ static bool property_collection_liboverride_editable(PointerRNA *ptr, void RNA_property_collection_add(PointerRNA *ptr, PropertyRNA *prop, PointerRNA *r_ptr) { IDProperty *idprop; - /* CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop; */ + // CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop; BLI_assert(RNA_property_type(prop) == PROP_COLLECTION); @@ -4046,8 +4046,8 @@ void RNA_property_collection_add(PointerRNA *ptr, PropertyRNA *prop, PointerRNA item->flag |= IDP_FLAG_OVERRIDELIBRARY_LOCAL; } IDP_AppendArray(idprop, item); - /* IDP_AppendArray does a shallow copy (memcpy), only free memory */ - /* IDP_FreePropertyContent(item); */ + /* #IDP_AppendArray does a shallow copy (memcpy), only free memory. */ + // IDP_FreePropertyContent(item); MEM_freeN(item); } } @@ -4089,7 +4089,7 @@ void RNA_property_collection_add(PointerRNA *ptr, PropertyRNA *prop, PointerRNA bool RNA_property_collection_remove(PointerRNA *ptr, PropertyRNA *prop, int key) { IDProperty *idprop; - /* CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop; */ + // CollectionPropertyRNA *cprop = (CollectionPropertyRNA *)prop; BLI_assert(RNA_property_type(prop) == PROP_COLLECTION); diff --git a/source/blender/makesrna/intern/rna_animation.cc b/source/blender/makesrna/intern/rna_animation.cc index e37c9bc8f53..fd4823a469a 100644 --- a/source/blender/makesrna/intern/rna_animation.cc +++ b/source/blender/makesrna/intern/rna_animation.cc @@ -1292,7 +1292,7 @@ static void rna_api_animdata_drivers(BlenderRNA *brna, PropertyRNA *cprop) PropertyRNA *parm; FunctionRNA *func; - /* PropertyRNA *prop; */ + // PropertyRNA *prop; RNA_def_property_srna(cprop, "AnimDataDrivers"); srna = RNA_def_struct(brna, "AnimDataDrivers", nullptr); diff --git a/source/blender/makesrna/intern/rna_armature.cc b/source/blender/makesrna/intern/rna_armature.cc index d399f5d576d..463a4a7dc54 100644 --- a/source/blender/makesrna/intern/rna_armature.cc +++ b/source/blender/makesrna/intern/rna_armature.cc @@ -1307,7 +1307,7 @@ static void rna_def_bone_common(StructRNA *srna, int editbone) RNA_def_property_update(prop, 0, "rna_Armature_update_data"); } RNA_def_property_float_sdna(prop, nullptr, "rad_head"); - /* XXX range is 0 to limit, where limit = 10000.0f * MAX2(1.0, view3d->grid); */ + /* XXX: range is 0 to limit, where `limit = 10000.0f * MAX2(1.0, view3d->grid)`. */ // RNA_def_property_range(prop, 0, 1000); RNA_def_property_ui_range(prop, 0.01, 100, 0.1, 3); RNA_def_property_ui_text( @@ -1321,7 +1321,7 @@ static void rna_def_bone_common(StructRNA *srna, int editbone) RNA_def_property_update(prop, 0, "rna_Armature_update_data"); } RNA_def_property_float_sdna(prop, nullptr, "rad_tail"); - /* XXX range is 0 to limit, where limit = 10000.0f * MAX2(1.0, view3d->grid); */ + /* XXX range is 0 to limit, where limit = `10000.0f * MAX2(1.0, view3d->grid)`. */ // RNA_def_property_range(prop, 0, 1000); RNA_def_property_ui_range(prop, 0.01, 100, 0.1, 3); RNA_def_property_ui_text( @@ -1736,8 +1736,8 @@ static void rna_def_armature_bones(BlenderRNA *brna, PropertyRNA *cprop) StructRNA *srna; PropertyRNA *prop; - /* FunctionRNA *func; */ - /* PropertyRNA *parm; */ + // FunctionRNA *func; + // PropertyRNA *parm; RNA_def_property_srna(cprop, "ArmatureBones"); srna = RNA_def_struct(brna, "ArmatureBones", nullptr); @@ -1753,7 +1753,7 @@ static void rna_def_armature_bones(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_property_update(prop, 0, "rna_Armature_update"); /* TODO: redraw. */ - /* RNA_def_property_collection_active(prop, prop_act); */ + // RNA_def_property_collection_active(prop, prop_act); } /* armature.bones.* */ @@ -1780,7 +1780,7 @@ static void rna_def_armature_edit_bones(BlenderRNA *brna, PropertyRNA *cprop) prop, nullptr, "rna_Armature_act_edit_bone_set", nullptr, nullptr); /* TODO: redraw. */ - /* RNA_def_property_collection_active(prop, prop_act); */ + // RNA_def_property_collection_active(prop, prop_act); /* add target */ func = RNA_def_function(srna, "new", "rna_Armature_edit_bone_new"); diff --git a/source/blender/makesrna/intern/rna_cloth.cc b/source/blender/makesrna/intern/rna_cloth.cc index d219588f1f9..ec18259e203 100644 --- a/source/blender/makesrna/intern/rna_cloth.cc +++ b/source/blender/makesrna/intern/rna_cloth.cc @@ -48,7 +48,7 @@ static void rna_cloth_dependency_update(Main *bmain, Scene *scene, PointerRNA *p static void rna_cloth_pinning_changed(Main * /*bmain*/, Scene * /*scene*/, PointerRNA *ptr) { Object *ob = (Object *)ptr->owner_id; - /* ClothSimSettings *settings = (ClothSimSettings *)ptr->data; */ + // ClothSimSettings *settings = (ClothSimSettings *)ptr->data; ClothModifierData *clmd = (ClothModifierData *)BKE_modifiers_findby_type(ob, eModifierType_Cloth); diff --git a/source/blender/makesrna/intern/rna_define.cc b/source/blender/makesrna/intern/rna_define.cc index 060b137d687..ba2a058e8cd 100644 --- a/source/blender/makesrna/intern/rna_define.cc +++ b/source/blender/makesrna/intern/rna_define.cc @@ -2750,7 +2750,7 @@ void RNA_def_property_string_sdna(PropertyRNA *prop, const char *structname, con void RNA_def_property_pointer_sdna(PropertyRNA *prop, const char *structname, const char *propname) { - /* PropertyDefRNA *dp; */ + // PropertyDefRNA *dp; StructRNA *srna = DefRNA.laststruct; if (!DefRNA.preprocess) { diff --git a/source/blender/makesrna/intern/rna_fcurve.cc b/source/blender/makesrna/intern/rna_fcurve.cc index 2597f92e3e1..372ba22c972 100644 --- a/source/blender/makesrna/intern/rna_fcurve.cc +++ b/source/blender/makesrna/intern/rna_fcurve.cc @@ -2050,7 +2050,7 @@ static void rna_def_drivervar(BlenderRNA *brna) static void rna_def_channeldriver_variables(BlenderRNA *brna, PropertyRNA *cprop) { StructRNA *srna; - /* PropertyRNA *prop; */ + // PropertyRNA *prop; FunctionRNA *func; PropertyRNA *parm; diff --git a/source/blender/makesrna/intern/rna_fcurve_api.cc b/source/blender/makesrna/intern/rna_fcurve_api.cc index 1686cc7971a..a01d5666fdc 100644 --- a/source/blender/makesrna/intern/rna_fcurve_api.cc +++ b/source/blender/makesrna/intern/rna_fcurve_api.cc @@ -96,8 +96,8 @@ void RNA_api_fcurves(StructRNA *srna) void RNA_api_drivers(StructRNA * /*srna*/) { - /* FunctionRNA *func; */ - /* PropertyRNA *parm; */ + // FunctionRNA *func; + // PropertyRNA *parm; } #endif diff --git a/source/blender/makesrna/intern/rna_image.cc b/source/blender/makesrna/intern/rna_image.cc index 8b56dcd7825..2b00795d23d 100644 --- a/source/blender/makesrna/intern/rna_image.cc +++ b/source/blender/makesrna/intern/rna_image.cc @@ -262,7 +262,7 @@ static void rna_ImageUser_relations_update(Main *bmain, Scene *scene, PointerRNA static char *rna_ImageUser_path(const PointerRNA *ptr) { if (ptr->owner_id) { - /* ImageUser *iuser = ptr->data; */ + // ImageUser *iuser = ptr->data; switch (GS(ptr->owner_id->name)) { case ID_OB: diff --git a/source/blender/makesrna/intern/rna_mesh.cc b/source/blender/makesrna/intern/rna_mesh.cc index c11f58a94b3..d7c338a024c 100644 --- a/source/blender/makesrna/intern/rna_mesh.cc +++ b/source/blender/makesrna/intern/rna_mesh.cc @@ -2627,7 +2627,7 @@ void rna_def_texmat_common(StructRNA *srna, const char *texspace_editable) static void rna_def_mesh_vertices(BlenderRNA *brna, PropertyRNA *cprop) { StructRNA *srna; - /* PropertyRNA *prop; */ + // PropertyRNA *prop; FunctionRNA *func; PropertyRNA *parm; @@ -2653,7 +2653,7 @@ static void rna_def_mesh_vertices(BlenderRNA *brna, PropertyRNA *cprop) static void rna_def_mesh_edges(BlenderRNA *brna, PropertyRNA *cprop) { StructRNA *srna; - /* PropertyRNA *prop; */ + // PropertyRNA *prop; FunctionRNA *func; PropertyRNA *parm; diff --git a/source/blender/makesrna/intern/rna_movieclip.cc b/source/blender/makesrna/intern/rna_movieclip.cc index eaf83cba4d0..9e1713ba654 100644 --- a/source/blender/makesrna/intern/rna_movieclip.cc +++ b/source/blender/makesrna/intern/rna_movieclip.cc @@ -122,7 +122,7 @@ static PointerRNA rna_MovieClip_metadata_get(MovieClip *clip) static char *rna_MovieClipUser_path(const PointerRNA *ptr) { if (ptr->owner_id) { - /* MovieClipUser *mc_user = ptr->data; */ + // MovieClipUser *mc_user = ptr->data; switch (GS(ptr->owner_id->name)) { case ID_CA: diff --git a/source/blender/makesrna/intern/rna_object.cc b/source/blender/makesrna/intern/rna_object.cc index ff5cf0f93ef..48862bf4bcd 100644 --- a/source/blender/makesrna/intern/rna_object.cc +++ b/source/blender/makesrna/intern/rna_object.cc @@ -2700,8 +2700,8 @@ static void rna_def_object_particle_systems(BlenderRNA *brna, PropertyRNA *cprop PropertyRNA *prop; - /* FunctionRNA *func; */ - /* PropertyRNA *parm; */ + // FunctionRNA *func; + // PropertyRNA *parm; RNA_def_property_srna(cprop, "ParticleSystems"); srna = RNA_def_struct(brna, "ParticleSystems", nullptr); diff --git a/source/blender/makesrna/intern/rna_particle.cc b/source/blender/makesrna/intern/rna_particle.cc index be1605966fd..0762aacac81 100644 --- a/source/blender/makesrna/intern/rna_particle.cc +++ b/source/blender/makesrna/intern/rna_particle.cc @@ -1781,12 +1781,12 @@ static void rna_def_child_particle(BlenderRNA *brna) RNA_def_struct_ui_text( srna, "Child Particle", "Child particle interpolated from simulated or edited particles"); - /* int num, parent; */ /* num is face index on the final derived mesh */ - - /* int pa[4]; */ /* nearest particles to the child, used for the interpolation */ - /* float w[4]; */ /* interpolation weights for the above particles */ - /* float fuv[4], foffset; */ /* face vertex weights and offset */ - /* float rand[3]; */ + // int num, parent; /* num is face index on the final derived mesh */ + // + // int pa[4]; /* nearest particles to the child, used for the interpolation */ + // float w[4]; /* interpolation weights for the above particles */ + // float fuv[4], foffset; /* face vertex weights and offset */ + // float rand[3]; } static void rna_def_particle(BlenderRNA *brna) @@ -1854,9 +1854,9 @@ static void rna_def_particle(BlenderRNA *brna) RNA_def_property_collection_sdna(prop, nullptr, "keys", "totkey"); RNA_def_property_struct_type(prop, "ParticleKey"); RNA_def_property_ui_text(prop, "Keyed States", ""); - /* */ - /* float fuv[4], foffset; */ /* Coordinates on face/edge number "num" and depth along. */ - /* Face normal for volume emission. */ + + // float fuv[4], foffset; /* Coordinates on face/edge number "num" and depth along. */ + // /* Face normal for volume emission. */ prop = RNA_def_property(srna, "birth_time", PROP_FLOAT, PROP_TIME); RNA_def_property_float_sdna(prop, nullptr, "time"); @@ -1876,12 +1876,10 @@ static void rna_def_particle(BlenderRNA *brna) // RNA_def_property_range(prop, lowerLimitf, upperLimitf); RNA_def_property_ui_text(prop, "Size", ""); - /* */ - /* int num; */ /* index to vert/edge/face */ - /* int num_dmcache; */ /* index to derived mesh data (face) to avoid slow lookups */ - /* int pad; */ - /* */ - /* int totkey; */ + // int num; /* index to vert/edge/face */ + // int num_dmcache; /* index to derived mesh data (face) to avoid slow lookups */ + // int pad; + // int totkey; /* flag */ prop = RNA_def_property(srna, "is_exist", PROP_BOOLEAN, PROP_NONE); @@ -1899,7 +1897,7 @@ static void rna_def_particle(BlenderRNA *brna) RNA_def_property_enum_items(prop, alive_items); RNA_def_property_ui_text(prop, "Alive State", ""); - /* short rt2; */ + // short rt2; /* UVs */ func = RNA_def_function(srna, "uv_on_emitter", "rna_Particle_uv_on_emitter"); diff --git a/source/blender/makesrna/intern/rna_pose.cc b/source/blender/makesrna/intern/rna_pose.cc index 1273f2dfae1..b6dc57dce30 100644 --- a/source/blender/makesrna/intern/rna_pose.cc +++ b/source/blender/makesrna/intern/rna_pose.cc @@ -87,7 +87,7 @@ const EnumPropertyItem rna_enum_color_sets_items[] = { static void rna_Pose_update(Main * /*bmain*/, Scene * /*scene*/, PointerRNA *ptr) { - /* XXX when to use this? ob->pose->flag |= (POSE_LOCKED|POSE_DO_UNLOCK); */ + // ob->pose->flag |= (POSE_LOCKED | POSE_DO_UNLOCK); /* XXX when to use this? */ DEG_id_tag_update(ptr->owner_id, ID_RECALC_GEOMETRY); WM_main_add_notifier(NC_OBJECT | ND_POSE, ptr->owner_id); @@ -103,7 +103,7 @@ static void rna_Pose_dependency_update(Main *bmain, Scene * /*scene*/, PointerRN static void rna_Pose_IK_update(Main * /*bmain*/, Scene * /*scene*/, PointerRNA *ptr) { - /* XXX when to use this? ob->pose->flag |= (POSE_LOCKED|POSE_DO_UNLOCK); */ + // ob->pose->flag |= (POSE_LOCKED | POSE_DO_UNLOCK); /* XXX: when to use this? */ Object *ob = (Object *)ptr->owner_id; DEG_id_tag_update(&ob->id, ID_RECALC_GEOMETRY); diff --git a/source/blender/makesrna/intern/rna_rna.cc b/source/blender/makesrna/intern/rna_rna.cc index a8e504ef203..4cc560904ab 100644 --- a/source/blender/makesrna/intern/rna_rna.cc +++ b/source/blender/makesrna/intern/rna_rna.cc @@ -670,7 +670,7 @@ static bool rna_Property_readonly_get(PointerRNA *ptr) /* don't use this because it will call functions that check the internal * data for introspection we only need to know if it can be edited so the * flag is better for this */ - /* return RNA_property_editable(ptr, prop); */ + // return RNA_property_editable(ptr, prop); return (prop->flag & PROP_EDITABLE) == 0; } diff --git a/source/blender/makesrna/intern/rna_scene.cc b/source/blender/makesrna/intern/rna_scene.cc index bc5c5a520ac..4401d8ee882 100644 --- a/source/blender/makesrna/intern/rna_scene.cc +++ b/source/blender/makesrna/intern/rna_scene.cc @@ -4466,7 +4466,7 @@ static void rna_def_view_layer_aov(BlenderRNA *brna) static void rna_def_view_layer_lightgroups(BlenderRNA *brna, PropertyRNA *cprop) { StructRNA *srna; - /* PropertyRNA *prop; */ + // PropertyRNA *prop; FunctionRNA *func; PropertyRNA *parm; diff --git a/source/blender/makesrna/intern/rna_wm.cc b/source/blender/makesrna/intern/rna_wm.cc index 11c67756058..c17c99dd253 100644 --- a/source/blender/makesrna/intern/rna_wm.cc +++ b/source/blender/makesrna/intern/rna_wm.cc @@ -2817,7 +2817,7 @@ static void rna_def_keyconfig(BlenderRNA *brna) prop = RNA_def_property(srna, "shift_ui", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "shift", 0); RNA_def_property_boolean_funcs(prop, "rna_KeyMapItem_shift_get", nullptr); - /* RNA_def_property_enum_items(prop, keymap_modifiers_items); */ + // RNA_def_property_enum_items(prop, keymap_modifiers_items); RNA_def_property_ui_text(prop, "Shift", "Shift key pressed"); RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_WINDOWMANAGER); RNA_def_property_update(prop, 0, "rna_KeyMapItem_update"); @@ -2825,21 +2825,21 @@ static void rna_def_keyconfig(BlenderRNA *brna) prop = RNA_def_property(srna, "ctrl_ui", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "ctrl", 0); RNA_def_property_boolean_funcs(prop, "rna_KeyMapItem_ctrl_get", nullptr); - /* RNA_def_property_enum_items(prop, keymap_modifiers_items); */ + // RNA_def_property_enum_items(prop, keymap_modifiers_items); RNA_def_property_ui_text(prop, "Ctrl", "Control key pressed"); RNA_def_property_update(prop, 0, "rna_KeyMapItem_update"); prop = RNA_def_property(srna, "alt_ui", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "alt", 0); RNA_def_property_boolean_funcs(prop, "rna_KeyMapItem_alt_get", nullptr); - /* RNA_def_property_enum_items(prop, keymap_modifiers_items); */ + // RNA_def_property_enum_items(prop, keymap_modifiers_items); RNA_def_property_ui_text(prop, "Alt", "Alt key pressed"); RNA_def_property_update(prop, 0, "rna_KeyMapItem_update"); prop = RNA_def_property(srna, "oskey_ui", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "oskey", 0); RNA_def_property_boolean_funcs(prop, "rna_KeyMapItem_oskey_get", nullptr); - /* RNA_def_property_enum_items(prop, keymap_modifiers_items); */ + // RNA_def_property_enum_items(prop, keymap_modifiers_items); RNA_def_property_ui_text(prop, "OS Key", "Operating system key pressed"); RNA_def_property_update(prop, 0, "rna_KeyMapItem_update"); /* End `_ui` modifiers. */ diff --git a/source/blender/python/generic/bgl.cc b/source/blender/python/generic/bgl.cc index 893dbf7a6a6..9b76b64878b 100644 --- a/source/blender/python/generic/bgl.cc +++ b/source/blender/python/generic/bgl.cc @@ -204,83 +204,83 @@ struct BufferOrOffset { * so we use signed everything (even stuff that should be unsigned. */ -/* typedef uint GLenum; */ +/* Type: `typedef uint GLenum`. */ #define GLenum_str "i" #define GLenum_var(num) bgl_var##num #define GLenum_ref(num) &bgl_var##num #define GLenum_def(num) /* unsigned */ int GLenum_var(num) -/* typedef uint GLboolean; */ +/* Type: `typedef uint GLboolean`. */ #define GLboolean_str "b" #define GLboolean_var(num) bgl_var##num #define GLboolean_ref(num) &bgl_var##num #define GLboolean_def(num) /* unsigned */ char GLboolean_var(num) -/* typedef uint GLbitfield; */ +/* Type: `typedef uint GLbitfield`. */ #define GLbitfield_str "i" #define GLbitfield_var(num) bgl_var##num #define GLbitfield_ref(num) &bgl_var##num #define GLbitfield_def(num) /* unsigned */ int GLbitfield_var(num) #if 0 -/* typedef signed char GLbyte; */ +/* Type: `typedef signed char GLbyte`. */ # define GLbyte_str "b" # define GLbyte_var(num) bgl_var##num # define GLbyte_ref(num) &bgl_var##num # define GLbyte_def(num) signed char GLbyte_var(num) #endif -/* typedef short GLshort; */ +/* Type: `typedef short GLshort`. */ #define GLshort_str "h" #define GLshort_var(num) bgl_var##num #define GLshort_ref(num) &bgl_var##num #define GLshort_def(num) short GLshort_var(num) -/* typedef int GLint; */ +/* Type: `typedef int GLint`. */ #define GLint_str "i" #define GLint_var(num) bgl_var##num #define GLint_ref(num) &bgl_var##num #define GLint_def(num) int GLint_var(num) -/* typedef int GLsizei; */ +/* Type: `typedef int GLsizei`. */ #define GLsizei_str "n" #define GLsizei_var(num) bgl_var##num #define GLsizei_ref(num) &bgl_var##num #define GLsizei_def(num) size_t GLsizei_var(num) -/* typedef int GLsizeiptr; */ +/* Type: `typedef int GLsizeiptr`. */ #define GLsizeiptr_str "n" #define GLsizeiptr_var(num) bgl_var##num #define GLsizeiptr_ref(num) &bgl_var##num #define GLsizeiptr_def(num) size_t GLsizeiptr_var(num) -/* typedef int GLintptr; */ +/* Type: `typedef int GLintptr`. */ #define GLintptr_str "n" #define GLintptr_var(num) bgl_var##num #define GLintptr_ref(num) &bgl_var##num #define GLintptr_def(num) size_t GLintptr_var(num) -/* typedef uchar GLubyte; */ +/* Type: `typedef uchar GLubyte`. */ #define GLubyte_str "B" #define GLubyte_var(num) bgl_var##num #define GLubyte_ref(num) &bgl_var##num #define GLubyte_def(num) /* unsigned */ char GLubyte_var(num) #if 0 -/* typedef ushort GLushort; */ +/* Type: `typedef ushort GLushort`. */ # define GLushort_str "H" # define GLushort_var(num) bgl_var##num # define GLushort_ref(num) &bgl_var##num # define GLushort_def(num) /* unsigned */ short GLushort_var(num) #endif -/* typedef uint GLuint; */ +/* Type: `typedef uint GLuint`. */ #define GLuint_str "I" #define GLuint_var(num) bgl_var##num #define GLuint_ref(num) &bgl_var##num #define GLuint_def(num) /* unsigned */ int GLuint_var(num) -/* typedef uint GLuint64; */ +/* Type: `typedef uint GLuint64`. */ #if 0 # define GLuint64_str "Q" # define GLuint64_var(num) bgl_var##num @@ -288,7 +288,7 @@ struct BufferOrOffset { # define GLuint64_def(num) /* unsigned */ int GLuint64_var(num) #endif -/* typedef uint GLsync; */ +/* Type: `typedef uint GLsync`. */ #if 0 # define GLsync_str "I" # define GLsync_var(num) bgl_var##num @@ -296,19 +296,19 @@ struct BufferOrOffset { # define GLsync_def(num) /* unsigned */ int GLsync_var(num) #endif -/* typedef float GLfloat; */ +/* Type: `typedef float GLfloat`. */ #define GLfloat_str "f" #define GLfloat_var(num) bgl_var##num #define GLfloat_ref(num) &bgl_var##num #define GLfloat_def(num) float GLfloat_var(num) -/* typedef char *GLstring; */ +/* Type: `typedef char *GLstring`. */ #define GLstring_str "s" #define GLstring_var(number) bgl_var##number #define GLstring_ref(number) &bgl_var##number #define GLstring_def(number) char *GLstring_var(number) -/* typedef float GLclampf; */ +/* Type: `typedef float GLclampf`. */ #if 0 # define GLclampf_str "f" # define GLclampf_var(num) bgl_var##num @@ -316,13 +316,13 @@ struct BufferOrOffset { # define GLclampf_def(num) float GLclampf_var(num) #endif -/* typedef double GLdouble; */ +/* Type: `typedef double GLdouble`. */ #define GLdouble_str "d" #define GLdouble_var(num) bgl_var##num #define GLdouble_ref(num) &bgl_var##num #define GLdouble_def(num) double GLdouble_var(num) -/* typedef double GLclampd; */ +/* Type: `typedef double GLclampd`. */ #if 0 # define GLclampd_str "d" # define GLclampd_var(num) bgl_var##num diff --git a/source/blender/sequencer/intern/effects.cc b/source/blender/sequencer/intern/effects.cc index df0d2e2fff9..098f277051a 100644 --- a/source/blender/sequencer/intern/effects.cc +++ b/source/blender/sequencer/intern/effects.cc @@ -2109,7 +2109,8 @@ static void RVBlurBitmap2_float(float *map, int width, int height, float blur, i /* Swap buffers */ swap = temp; - temp = map; /* map = swap; */ /* UNUSED */ + temp = map; + // map = swap; /* UNUSED. */ /* Tidy up. */ MEM_freeN(filter); diff --git a/source/blender/simulation/intern/SIM_mass_spring.cc b/source/blender/simulation/intern/SIM_mass_spring.cc index 44904f9b2a7..78a5d9a36c2 100644 --- a/source/blender/simulation/intern/SIM_mass_spring.cc +++ b/source/blender/simulation/intern/SIM_mass_spring.cc @@ -301,7 +301,7 @@ static int UNUSED_FUNCTION(cloth_calc_helper_forces)( steps = 55; for (i = 0; i < steps; i++) { for (node = cloth->springs; node; node = node->next) { - /* ClothVertex *cv1, *cv2; */ /* UNUSED */ + // ClothVertex *cv1, *cv2; /* UNUSED */ int v1, v2; float len, c, l, vec[3]; @@ -312,8 +312,8 @@ static int UNUSED_FUNCTION(cloth_calc_helper_forces)( v1 = spring->ij; v2 = spring->kl; - /* cv1 = cloth->verts + v1; */ /* UNUSED */ - /* cv2 = cloth->verts + v2; */ /* UNUSED */ + // cv1 = cloth->verts + v1; /* UNUSED. */ + // cv2 = cloth->verts + v2; /* UNUSED. */ len = len_v3v3(cos[v1], cos[v2]); sub_v3_v3v3(vec, cos[v1], cos[v2]);