diff --git a/CMakeLists.txt b/CMakeLists.txt index f9fec79a755..0611614fe18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1420,7 +1420,7 @@ set(PLATFORM_CFLAGS) set(C_WARNINGS) set(CXX_WARNINGS) -# NOTE: These flags are intended for situations where where it's impractical to +# NOTE: These flags are intended for situations where it's impractical to # suppress warnings by modifying the code or for code which is maintained externally. # For GCC this typically means adding `-Wno-*` arguments to negate warnings # that are useful in the general case. diff --git a/doc/python_api/examples/bpy.types.Depsgraph.1.py b/doc/python_api/examples/bpy.types.Depsgraph.1.py index e3f35c53bc5..ba7b5cf7d7b 100644 --- a/doc/python_api/examples/bpy.types.Depsgraph.1.py +++ b/doc/python_api/examples/bpy.types.Depsgraph.1.py @@ -26,7 +26,7 @@ class OBJECT_OT_evaluated_example(bpy.types.Operator): # current scene and view layer. # # NOTE: This call ensure the dependency graph is fully evaluated. This might be expensive - # if changes were made made to the scene, but is needed to ensure no dangling or incorrect + # if changes were made to the scene, but is needed to ensure no dangling or incorrect # pointers are exposed. depsgraph = context.evaluated_depsgraph_get() # Actually request evaluated object. diff --git a/intern/cycles/device/hip/util.cpp b/intern/cycles/device/hip/util.cpp index 86456f8e012..1f9b9081adb 100644 --- a/intern/cycles/device/hip/util.cpp +++ b/intern/cycles/device/hip/util.cpp @@ -48,7 +48,7 @@ bool hipSupportsDriver() { # ifdef _WIN32 # ifndef WITH_HIP_SDK_5 - /* This check is only neccesary if we're using HIP SDK 6 or newer. */ + /* This check is only necessary if we're using HIP SDK 6 or newer. */ int hip_driver_version = 0; hipError_t result = hipDriverGetVersion(&hip_driver_version); if (result != hipSuccess) { diff --git a/source/blender/blendthumb/src/thumbnail_provider.mm b/source/blender/blendthumb/src/thumbnail_provider.mm index 785550f99e5..6ca562e23e9 100644 --- a/source/blender/blendthumb/src/thumbnail_provider.mm +++ b/source/blender/blendthumb/src/thumbnail_provider.mm @@ -50,7 +50,7 @@ xattr -rl bin/Blender.app/Contents/Plugins/blender-thumbnailer.appex * - Is it registered with lsregister and there isn't a conflict with another plugin taking * precedence? lsregister -dump | grep blender-thumbnailer.appex - * - For RBSLaunchRequest error: is the executable executable? chmod u+x + * - For RBSLaunchRequest error: is the executable flag set? chmod u+x bin/Blender.app/Contents/PlugIns/blender-thumbnailer.appex/Contents/MacOS/blender-thumbnailer * - Is it codesigned and sandboxed? * codesign --display --verbose --entitlements - --xml \ diff --git a/source/blender/blenkernel/BKE_grease_pencil.hh b/source/blender/blenkernel/BKE_grease_pencil.hh index b8137f35133..0e04d72e2f7 100644 --- a/source/blender/blenkernel/BKE_grease_pencil.hh +++ b/source/blender/blenkernel/BKE_grease_pencil.hh @@ -425,7 +425,7 @@ class LayerRuntime { LayerTransformData trans_data_; /* Whether this layer's visibility is animated (via the ".hide" RNA property). This is only set - * when creating a copy of of the owning GreasePencil ID for the depsgraph evaluation. */ + * when creating a copy of the owning GreasePencil ID for the depsgraph evaluation. */ bool is_visisbility_animated_; public: diff --git a/source/blender/blenlib/BLI_index_mask.hh b/source/blender/blenlib/BLI_index_mask.hh index 16da54ad63e..d848253dd7c 100644 --- a/source/blender/blenlib/BLI_index_mask.hh +++ b/source/blender/blenlib/BLI_index_mask.hh @@ -588,7 +588,7 @@ int64_t consolidate_index_mask_segments(MutableSpan segments, IndexMaskMemory &memory); /** - * Adds index mask segments to the the vector for the given range. Ranges shorter than + * Adds index mask segments to the vector for the given range. Ranges shorter than * #max_segment_size fit into a single segment. Larger ranges are split into multiple segments. */ template diff --git a/source/blender/bmesh/operators/bmo_dissolve.cc b/source/blender/bmesh/operators/bmo_dissolve.cc index e5679cd649a..f07e2eb21dc 100644 --- a/source/blender/bmesh/operators/bmo_dissolve.cc +++ b/source/blender/bmesh/operators/bmo_dissolve.cc @@ -329,7 +329,7 @@ void bmo_dissolve_edges_exec(BMesh *bm, BMOperator *op) } } - /* Cleanup geometry. Remove any verts that are garbage collectible and that that have became + /* Cleanup geometry. Remove any verts that are garbage collectible and that have became * isolated verts (no edges) because of edge dissolves. */ BM_ITER_MESH_MUTABLE (v, v_next, &iter, bm, BM_VERTS_OF_MESH) { if ((v->e == nullptr) && BMO_vert_flag_test(bm, v, VERT_ISGC)) { diff --git a/source/blender/editors/interface/regions/interface_region_tooltip.cc b/source/blender/editors/interface/regions/interface_region_tooltip.cc index 3c6c60683f1..2845d3bc154 100644 --- a/source/blender/editors/interface/regions/interface_region_tooltip.cc +++ b/source/blender/editors/interface/regions/interface_region_tooltip.cc @@ -1368,7 +1368,7 @@ static ARegion *ui_tooltip_create_with_data(bContext *C, /* Clamp to window bounds. */ { - /* Ensure at least 5 px above screen bounds. + /* Ensure at least 5 pixels above screen bounds. * #UI_UNIT_Y is just a guess to be above the menu item. */ if (init_rect_overlap != nullptr) { const int pad = max_ff(1.0f, U.pixelsize) * 5; diff --git a/source/blender/editors/object/object_edit.cc b/source/blender/editors/object/object_edit.cc index 78d0301d613..9f50a7338bc 100644 --- a/source/blender/editors/object/object_edit.cc +++ b/source/blender/editors/object/object_edit.cc @@ -1769,7 +1769,7 @@ void OBJECT_OT_shade_smooth_by_angle(wmOperatorType *ot) * \{ */ /** - * Does a shallow check for whether the node group could be the the Smooth by Angle node group. + * Does a shallow check for whether the node group could be the Smooth by Angle node group. * This should become unnecessary once we asset embedding (#132167). */ static bool is_valid_smooth_by_angle_group(const bNodeTree &ntree) diff --git a/source/blender/editors/sculpt_paint/sculpt_transform.cc b/source/blender/editors/sculpt_paint/sculpt_transform.cc index a4ad44230d0..1be3459edf6 100644 --- a/source/blender/editors/sculpt_paint/sculpt_transform.cc +++ b/source/blender/editors/sculpt_paint/sculpt_transform.cc @@ -578,7 +578,7 @@ void update_modal_transform(bContext *C, Object &ob) void cancel_modal_transform(bContext *C, Object &ob) { - /* Cancelling "Elastic" transforms (due to its TransformDisplacementMode::Incremental nature), + /* Canceling "Elastic" transforms (due to its #TransformDisplacementMode::Incremental nature), * requires restoring positions from undo. For "All Vertices" there is no benefit in using the * transform system to update to original positions either. */ Depsgraph *depsgraph = CTX_data_depsgraph_pointer(C); diff --git a/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh b/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh index 5a8b69202b1..c13f9574c81 100644 --- a/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh +++ b/source/blender/gpu/glsl_preprocess/glsl_preprocess.hh @@ -565,7 +565,7 @@ class Preprocessor { /** * Example replacement: * - * ` + * \code{.cc} * // Source * shared float bar[10]; // Source declaration. * shared float foo; // Source declaration. @@ -598,7 +598,7 @@ class Preprocessor { * * } // Added at runtime by backend. * // End of Backend Output - * ` + * \endcode */ std::stringstream args, assign, declare, pass; diff --git a/source/blender/gpu/opengl/gl_backend.cc b/source/blender/gpu/opengl/gl_backend.cc index 3ecc0728c52..63d9785058c 100644 --- a/source/blender/gpu/opengl/gl_backend.cc +++ b/source/blender/gpu/opengl/gl_backend.cc @@ -494,7 +494,7 @@ static void detect_workarounds() GLContext::multi_bind_image_support = false; } - /* #134509 Intel ARC GPU have a driver bug that break the display of batched nodelinks. + /* #134509 Intel ARC GPU have a driver bug that break the display of batched node-links. * Disabling batching fixes the issue. */ if (GPU_type_matches(GPU_DEVICE_INTEL, GPU_OS_ANY, GPU_DRIVER_OFFICIAL)) { if (strstr(renderer, "Arc")) {