diff --git a/build_files/build_environment/patches/aom.diff b/build_files/build_environment/patches/aom.diff index 1611cff5dca..64aea877db9 100644 --- a/build_files/build_environment/patches/aom.diff +++ b/build_files/build_environment/patches/aom.diff @@ -2,13 +2,13 @@ diff -Naur libaom-3.4.0/build/cmake/aom_configure.cmake external_aom/build/cmake --- libaom-3.4.0/build/cmake/aom_configure.cmake 2022-06-17 11:46:18 -0600 +++ external_aom/build/cmake/aom_configure.cmake 2022-10-16 15:35:54 -0600 @@ -15,8 +15,12 @@ - + include(FindGit) include(FindPerl) -include(FindThreads) - +# Blender: This will drag in a dep on libwinpthreads which we prefer -+# not to have, aom will fallback on a native win32 thread wrapper ++# not to have, aom will fall back on a native win32 thread wrapper +# if pthreads are not found. +if(NOT WIN32) + include(FindThreads) diff --git a/doc/python_api/rst/info_tips_and_tricks.rst b/doc/python_api/rst/info_tips_and_tricks.rst index 18d4d823f44..c40427f170d 100644 --- a/doc/python_api/rst/info_tips_and_tricks.rst +++ b/doc/python_api/rst/info_tips_and_tricks.rst @@ -207,7 +207,7 @@ will not be found by Blender. There are two ways to work around this: -- Remove Blender Python subdirectory, Blender will then fallback on the system's Python and use that instead. +- Remove Blender Python subdirectory, Blender will then fall back on the system's Python and use that instead. Depending on your platform, you may need to explicitly reference the location of your Python installation using diff --git a/intern/cycles/bvh/build.cpp b/intern/cycles/bvh/build.cpp index 3d95f3cb8f5..2598768c476 100644 --- a/intern/cycles/bvh/build.cpp +++ b/intern/cycles/bvh/build.cpp @@ -978,7 +978,7 @@ unique_ptr BVHBuild::create_leaf_node(const BVHRange &range, * and lots of cache misses. * - If the size is too small, then we can run out of memory * allowed to be used by vector. - * In practice it wouldn't mean crash, just allocator will fallback + * In practice it wouldn't mean crash, just allocator will fall back * to heap which is slower. * - Optimistic re-allocation in STL could jump us out of stack usage * because re-allocation happens in chunks and size of those chunks we diff --git a/intern/cycles/kernel/osl/shaders/node_image_texture.osl b/intern/cycles/kernel/osl/shaders/node_image_texture.osl index 10e4f692d31..448e2118bb7 100644 --- a/intern/cycles/kernel/osl/shaders/node_image_texture.osl +++ b/intern/cycles/kernel/osl/shaders/node_image_texture.osl @@ -176,7 +176,7 @@ shader node_image_texture(int use_mapping = 0, } } else { - /* Desperate mode, no valid choice anyway, fallback to one side.*/ + /* Desperate mode, no valid choice anyway, fall back to one side.*/ weight[0] = 1.0; } diff --git a/intern/cycles/kernel/osl/shaders/node_principled_hair_bsdf.osl b/intern/cycles/kernel/osl/shaders/node_principled_hair_bsdf.osl index bd7229ddcc6..0dbcde4be83 100644 --- a/intern/cycles/kernel/osl/shaders/node_principled_hair_bsdf.osl +++ b/intern/cycles/kernel/osl/shaders/node_principled_hair_bsdf.osl @@ -90,7 +90,7 @@ shader node_principled_hair_bsdf(color Color = color(0.017513, 0.005763, 0.00205 sigma = sigma_from_reflectance(Color, radial_roughness); } else { - /* Fallback to brownish hair, same as defaults for melanin. */ + /* Fall back to brownish hair, same as defaults for melanin. */ sigma = sigma_from_concentration(0.0, 0.8054375); } diff --git a/intern/cycles/kernel/svm/image.h b/intern/cycles/kernel/svm/image.h index e351051f902..0d184dcbe2f 100644 --- a/intern/cycles/kernel/svm/image.h +++ b/intern/cycles/kernel/svm/image.h @@ -196,7 +196,7 @@ ccl_device_noinline void svm_node_tex_image_box(KernelGlobals kg, } } else { - /* Desperate mode, no valid choice anyway, fallback to one side. */ + /* Desperate mode, no valid choice anyway, fall back to one side. */ weight.x = 1.0f; } diff --git a/intern/cycles/kernel/svm/tex_coord.h b/intern/cycles/kernel/svm/tex_coord.h index fc8e57feed8..ab551853de9 100644 --- a/intern/cycles/kernel/svm/tex_coord.h +++ b/intern/cycles/kernel/svm/tex_coord.h @@ -353,7 +353,7 @@ ccl_device_noinline void svm_node_normal_map(KernelGlobals kg, if (space == NODE_NORMAL_MAP_TANGENT) { /* tangent space */ if (sd->object == OBJECT_NONE || (sd->type & PRIMITIVE_TRIANGLE) == 0) { - /* Fallback to unperturbed normal. */ + /* Fall back to unperturbed normal. */ stack_store_float3(stack, normal_offset, sd->N); return; } @@ -363,7 +363,7 @@ ccl_device_noinline void svm_node_normal_map(KernelGlobals kg, const AttributeDescriptor attr_sign = find_attribute(kg, sd, node.w); if (attr.offset == ATTR_STD_NOT_FOUND || attr_sign.offset == ATTR_STD_NOT_FOUND) { - /* Fallback to unperturbed normal. */ + /* Fall back to unperturbed normal. */ stack_store_float3(stack, normal_offset, sd->N); return; } diff --git a/intern/cycles/scene/shader.cpp b/intern/cycles/scene/shader.cpp index 2f8807d12f4..666e44865c4 100644 --- a/intern/cycles/scene/shader.cpp +++ b/intern/cycles/scene/shader.cpp @@ -497,7 +497,7 @@ void ShaderManager::device_update_pre(Device *device, shader->id = id++; } - /* Those shaders should always be compiled as they are used as fallback if a shader cannot be + /* Those shaders should always be compiled as they are used as a fallback if a shader cannot be * found, e.g. bad shader index for the triangle shaders on a Mesh. */ assert(scene->default_surface->reference_count() != 0); assert(scene->default_light->reference_count() != 0); diff --git a/intern/ghost/intern/GHOST_ISystem.cc b/intern/ghost/intern/GHOST_ISystem.cc index fc6b461f3b1..924514e8602 100644 --- a/intern/ghost/intern/GHOST_ISystem.cc +++ b/intern/ghost/intern/GHOST_ISystem.cc @@ -85,7 +85,7 @@ GHOST_TSuccess GHOST_ISystem::createSystem(bool verbose, [[maybe_unused]] bool b } if (!m_system) { - /* Try to fallback to X11. */ + /* Try to fall back to X11. */ backends_attempted.push_back({"X11"}); try { m_system = new GHOST_SystemX11(); @@ -199,7 +199,7 @@ GHOST_TSuccess GHOST_ISystem::createSystemBackground() if (success) { return success; } - /* Try to fallback to headless mode if all else fails. */ + /* Try to fall back to headless mode if all else fails. */ #endif m_system = new GHOST_SystemHeadless(); success = m_system != nullptr ? GHOST_kSuccess : GHOST_kFailure; diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 7e020cc8485..fccaeec7b65 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -282,7 +282,7 @@ static GHOST_TKey convertKey(int rawCode, unichar recvChar) /* Get actual character value of the "remappable" keys in international keyboards, * if keyboard layout is not correctly reported (e.g. some non Apple keyboards in Tiger), - * then fallback on using the received #charactersIgnoringModifiers. */ + * then fall back on using the received #charactersIgnoringModifiers. */ if (uchrHandle) { UInt32 deadKeyState = 0; UniCharCount actualStrLength = 0; @@ -1645,7 +1645,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) GHOST_Rect bounds, windowBounds, correctedBounds; - /* fallback to window bounds */ + /* fall back to window bounds */ if (window->getCursorGrabBounds(bounds) == GHOST_kFailure) { window->getClientBounds(bounds); } diff --git a/intern/ghost/intern/GHOST_SystemSDL.cc b/intern/ghost/intern/GHOST_SystemSDL.cc index 2e756fd738b..bed3d1e5c6f 100644 --- a/intern/ghost/intern/GHOST_SystemSDL.cc +++ b/intern/ghost/intern/GHOST_SystemSDL.cc @@ -437,7 +437,7 @@ static char convert_keyboard_event_to_ascii(const SDL_KeyboardEvent &sdl_sub_evt /** * Events don't always have valid windows, - * but GHOST needs a window _always_. fallback to the GL window. + * but GHOST needs a window _always_. Fall back to the GL window. */ static SDL_Window *SDL_GetWindowFromID_fallback(Uint32 id) { diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 7c7db453029..fed0ecc0090 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -408,7 +408,7 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(GHOST_SystemCocoa *systemCocoa, view = m_metalView; } else { - /* Fallback to OpenGL view if there is no Metal support. */ + /* Fall back to OpenGL view if there is no Metal support. */ m_openGLView = [[CocoaOpenGLView alloc] initWithSystemCocoa:systemCocoa windowCocoa:this frame:rect]; diff --git a/intern/ghost/intern/GHOST_WindowX11.cc b/intern/ghost/intern/GHOST_WindowX11.cc index afba8a0dc62..f6abc61df6e 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cc +++ b/intern/ghost/intern/GHOST_WindowX11.cc @@ -1231,7 +1231,7 @@ GHOST_Context *GHOST_WindowX11::newDrawingContext(GHOST_TDrawingContextType type } delete context; } - /* EGL initialization failed, try to fallback to a GLX context. */ + /* EGL initialization failed, try to fall back to a GLX context. */ # endif for (int minor = 6; minor >= 3; --minor) { @@ -1520,7 +1520,7 @@ uint16_t GHOST_WindowX11::getDPIHint() } } - /* Fallback to calculating DPI using X reported DPI, set using `xrandr --dpi`. */ + /* Fall back to calculating DPI using X reported DPI, set using `xrandr --dpi`. */ XWindowAttributes attr; if (!XGetWindowAttributes(m_display, m_window, &attr)) { /* Failed to get window attributes, return X11 default DPI */ diff --git a/intern/ghost/intern/GHOST_XrSession.cc b/intern/ghost/intern/GHOST_XrSession.cc index 65fbef46f08..0d7de276c23 100644 --- a/intern/ghost/intern/GHOST_XrSession.cc +++ b/intern/ghost/intern/GHOST_XrSession.cc @@ -186,7 +186,7 @@ static void create_reference_spaces(OpenXRSessionData &oxr, "space. To use the stage reference space, please define a tracking space via the XR " "runtime.\n"); } - /* Fallback to local space. */ + /* Fall back to local space. */ if (oxr.reference_space != XR_NULL_HANDLE) { CHECK_XR(xrDestroySpace(oxr.reference_space), "Failed to destroy stage reference space."); } diff --git a/intern/guardedalloc/intern/mallocn_guarded_impl.cc b/intern/guardedalloc/intern/mallocn_guarded_impl.cc index 89a7c1887ee..e4dc29a9968 100644 --- a/intern/guardedalloc/intern/mallocn_guarded_impl.cc +++ b/intern/guardedalloc/intern/mallocn_guarded_impl.cc @@ -744,7 +744,7 @@ void *MEM_guarded_calloc_arrayN_aligned(const size_t len, const char *str) { size_t bytes_num; - /* There is no lower level #calloc with an alignment parameter, so we have to fallback to using + /* There is no lower level #calloc with an alignment parameter, so we have to fall back to using * #memset unfortunately. */ void *ptr = mem_guarded_malloc_arrayN_aligned(len, size, alignment, str, bytes_num); if (!ptr) { diff --git a/scripts/addons_core/rigify/utils/layers.py b/scripts/addons_core/rigify/utils/layers.py index 77706884f1d..6dd04994518 100644 --- a/scripts/addons_core/rigify/utils/layers.py +++ b/scripts/addons_core/rigify/utils/layers.py @@ -140,7 +140,7 @@ def resolve_collection_reference(obj: ArmatureObject, ref: Any, *, ref["name"] = coll.name return coll - # Fallback to lookup by name only if possible + # Fall back to lookup by name only if possible if name_coll: if update: ref["uid"] = ensure_collection_uid(name_coll) diff --git a/scripts/modules/keyingsets_utils.py b/scripts/modules/keyingsets_utils.py index af871311c3c..c4724bbf4e9 100644 --- a/scripts/modules/keyingsets_utils.py +++ b/scripts/modules/keyingsets_utils.py @@ -153,7 +153,7 @@ def get_transform_generators_base_info(data): path = data.path_from_id() # try to use the name of the data element to group the F-Curve - # else fallback on the KeyingSet name + # else fall back on the KeyingSet name grouping = getattr(data, "name", None) # return the ID-block and the path diff --git a/source/blender/blenkernel/BKE_context.hh b/source/blender/blenkernel/BKE_context.hh index ab5f12197f4..7b39fafd523 100644 --- a/source/blender/blenkernel/BKE_context.hh +++ b/source/blender/blenkernel/BKE_context.hh @@ -369,7 +369,7 @@ Scene *CTX_data_scene(const bContext *C); * but not the scene_collection. In this case what to do? * * If the scene_collection is linked to the #ViewLayer we use it. - * Otherwise we fallback to the active one of the #ViewLayer. + * Otherwise we fall back to the active one of the #ViewLayer. */ LayerCollection *CTX_data_layer_collection(const bContext *C); Collection *CTX_data_collection(const bContext *C); diff --git a/source/blender/blenkernel/BKE_lib_id.hh b/source/blender/blenkernel/BKE_lib_id.hh index bf8a482086e..f6303f46d65 100644 --- a/source/blender/blenkernel/BKE_lib_id.hh +++ b/source/blender/blenkernel/BKE_lib_id.hh @@ -729,7 +729,7 @@ void BKE_lib_id_expand_local(Main *bmain, ID *id, int flags); * * \param newname: The new name of the given ID, if `nullptr` the current given ID name is used * instead. If the given ID has no name (or the given name is an empty string), the default - * matching data name is used as fallback. + * matching data name is used as a fallback. * \param do_linked_data: if true, also ensure a unique name in case the given ID is linked * (otherwise, just ensure that it is properly sorted). * diff --git a/source/blender/blenkernel/intern/collection.cc b/source/blender/blenkernel/intern/collection.cc index 9d69434cf59..4c2fe8155c7 100644 --- a/source/blender/blenkernel/intern/collection.cc +++ b/source/blender/blenkernel/intern/collection.cc @@ -1528,7 +1528,7 @@ void BKE_collection_object_add_from(Main *bmain, Scene *scene, Object *ob_src, O if (!is_instantiated) { /* In case we could not find any non-linked collections in which instantiate our ob_dst, - * fallback to scene's master collection... */ + * fall back to scene's master collection... */ collection_object_add(bmain, scene->master_collection, ob_dst, nullptr, 0, true); } diff --git a/source/blender/blenkernel/intern/collision.cc b/source/blender/blenkernel/intern/collision.cc index d819dce7122..4c66656d8ad 100644 --- a/source/blender/blenkernel/intern/collision.cc +++ b/source/blender/blenkernel/intern/collision.cc @@ -295,7 +295,7 @@ static float compute_collision_point_tri_tri(const float a1[3], } } - /* If no point is found, will fallback onto regular proximity test below. */ + /* If no point is found, will fall back onto regular proximity test below. */ if (found) { sub_v3_v3v3(r_vec, r_b, r_a); @@ -482,7 +482,7 @@ static float compute_collision_point_edge_tri(const float a1[3], } } - /* If no point is found, will fallback onto regular proximity test below. */ + /* If no point is found, will fall back onto regular proximity test below. */ if (found) { sub_v3_v3v3(r_vec, r_b, r_a); diff --git a/source/blender/blenkernel/intern/compositor.cc b/source/blender/blenkernel/intern/compositor.cc index 7fcef96e88a..5b145b2c4bf 100644 --- a/source/blender/blenkernel/intern/compositor.cc +++ b/source/blender/blenkernel/intern/compositor.cc @@ -64,8 +64,8 @@ static void add_passes_used_by_cryptomatte_node(const bNode *node, return; } - /* If the stored layer name doesn't corresponds to an existing Cryptomatte layer, fallback to the - * name of the first layer. */ + /* If the stored layer name doesn't corresponds to an existing Cryptomatte layer, fall back to + * the name of the first layer. */ const NodeCryptomatte *data = static_cast(node->storage); const std::string layer_name = layer_names.contains(data->layer_name) ? data->layer_name : layer_names[0]; diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc index 4e1d72f2cac..4aba8bfb7ad 100644 --- a/source/blender/blenkernel/intern/image.cc +++ b/source/blender/blenkernel/intern/image.cc @@ -3366,7 +3366,7 @@ void BKE_image_signal(Main *bmain, Image *ima, ImageUser *iuser, int signal) /** * \return render-pass for a given pass index and active view. - * fallback to available if there are missing passes for active view. + * fall back to available if there are missing passes for active view. */ static RenderPass *image_render_pass_get(RenderLayer *rl, const int pass, @@ -3397,7 +3397,7 @@ static RenderPass *image_render_pass_get(RenderLayer *rl, } } - /* fallback to the first pass in the layer */ + /* fall back to the first pass in the layer */ if (rpass_ret == nullptr) { rp_index = 0; rpass_ret = static_cast(rl->passes.first); diff --git a/source/blender/blenkernel/intern/mesh_remap.cc b/source/blender/blenkernel/intern/mesh_remap.cc index 4029c231ae2..776d6fdd0d5 100644 --- a/source/blender/blenkernel/intern/mesh_remap.cc +++ b/source/blender/blenkernel/intern/mesh_remap.cc @@ -1620,7 +1620,7 @@ void BKE_mesh_remap_calc_loops_from_mesh(const int mode, w /= MREMAP_RAYCAST_APPROXIMATE_FAC; } if (n == -1) { - /* Fallback to 'nearest' hit here, loops usually comes in 'face group', not good to + /* Fall back to 'nearest' hit here, loops usually comes in 'face group', not good to * have only part of one dest face's loops to map to source. * Note that since we give this a null weight, if whole weight for a given face * is null, it means none of its loop mapped to this source island, diff --git a/source/blender/blenkernel/intern/packedFile.cc b/source/blender/blenkernel/intern/packedFile.cc index 2f0627898dd..0a81572f652 100644 --- a/source/blender/blenkernel/intern/packedFile.cc +++ b/source/blender/blenkernel/intern/packedFile.cc @@ -585,7 +585,7 @@ static void unpack_generate_paths(const char *filepath, } if (temp_dirname[0] == '\0') { - /* Fallback to relative dir. */ + /* Fall back to relative dir. */ STRNCPY(temp_dirname, "//"); } diff --git a/source/blender/blenkernel/intern/rigidbody.cc b/source/blender/blenkernel/intern/rigidbody.cc index cadafd1f52e..95ef4f2d247 100644 --- a/source/blender/blenkernel/intern/rigidbody.cc +++ b/source/blender/blenkernel/intern/rigidbody.cc @@ -612,7 +612,7 @@ void BKE_rigidbody_calc_volume(Object *ob, float *r_vol) } } else { - /* rough estimate from boundbox as fallback */ + /* rough estimate from boundbox as a fallback */ /* XXX could implement other types of geometry here (curves, etc.) */ volume = size[0] * size[1] * size[2]; } diff --git a/source/blender/blenkernel/intern/screen.cc b/source/blender/blenkernel/intern/screen.cc index a031d617049..7f0ecc60ace 100644 --- a/source/blender/blenkernel/intern/screen.cc +++ b/source/blender/blenkernel/intern/screen.cc @@ -862,7 +862,7 @@ ARegion *BKE_area_find_region_active_win(const ScrArea *area) return region; } - /* fallback to any */ + /* fall back to any */ return BKE_area_find_region_type(area, RGN_TYPE_WINDOW); } diff --git a/source/blender/blenkernel/intern/shrinkwrap.cc b/source/blender/blenkernel/intern/shrinkwrap.cc index 6efad8c4342..ed9b2c87844 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.cc +++ b/source/blender/blenkernel/intern/shrinkwrap.cc @@ -1054,7 +1054,7 @@ void BKE_shrinkwrap_find_nearest_surface(ShrinkwrapTreeData *tree, #endif if (nearest->index < 0) { - /* fallback to simple nearest */ + /* fall back to simple nearest */ BLI_bvhtree_find_nearest(tree->bvh, co, nearest, treeData->nearest_callback, treeData); } } @@ -1197,7 +1197,7 @@ void BKE_shrinkwrap_compute_smooth_normal(const ShrinkwrapTreeData *tree, BLI_space_transform_invert_normal(transform, r_no); } } - /* Finally fallback to the corner_tris normal. */ + /* Finally fall back to the corner_tris normal. */ else { copy_v3_v3(r_no, hit_no); } diff --git a/source/blender/blenkernel/intern/tracking_stabilize.cc b/source/blender/blenkernel/intern/tracking_stabilize.cc index 9f1597759a8..1694da26df5 100644 --- a/source/blender/blenkernel/intern/tracking_stabilize.cc +++ b/source/blender/blenkernel/intern/tracking_stabilize.cc @@ -1324,7 +1324,7 @@ static void tracking_stabilize_frame_interpolation_cb(void *__restrict userdata, } } else { - /* Nearest or fallback to nearest. */ + /* Nearest or fall back to nearest. */ for (int x = 0; x < tmpibuf->x; x++, dst++) { vec[0] = float(x); mul_v3_m4v3(rvec, mat, vec); @@ -1350,7 +1350,7 @@ static void tracking_stabilize_frame_interpolation_cb(void *__restrict userdata, } } else { - /* Nearest or fallback to nearest. */ + /* Nearest or fall back to nearest. */ for (int x = 0; x < tmpibuf->x; x++, dst++) { vec[0] = float(x); mul_v3_m4v3(rvec, mat, vec); diff --git a/source/blender/blenkernel/intern/tracking_util.cc b/source/blender/blenkernel/intern/tracking_util.cc index dee31a7f331..517970ac640 100644 --- a/source/blender/blenkernel/intern/tracking_util.cc +++ b/source/blender/blenkernel/intern/tracking_util.cc @@ -433,7 +433,7 @@ static void distortion_model_parameters_from_tracking( } /* Unknown distortion model, which might be due to opening newer file in older Blender. - * Fallback to a known and supported model with 0 distortion. */ + * Fall back to a known and supported model with 0 distortion. */ camera_intrinsics_options->distortion_model = LIBMV_DISTORTION_MODEL_POLYNOMIAL; camera_intrinsics_options->polynomial_k1 = 0.0; camera_intrinsics_options->polynomial_k2 = 0.0; @@ -544,16 +544,14 @@ MovieTrackingMarker *tracking_get_keyframed_marker(MovieTrackingTrack *track, if ((cur_marker->flag & MARKER_DISABLED) == 0) { /* If it'll happen so we didn't find a real keyframe marker, - * fallback to the first marker in current tracked segment - * as a keyframe. - */ + * fall back to the first marker in current tracked segment + * as a keyframe. */ if (next_marker == nullptr) { /* Could happen when trying to get reference marker for the fist * one on the segment which isn't surrounded by disabled markers. * * There's no really good choice here, just use the reference - * marker which looks correct.. - */ + * marker which looks correct.. */ if (marker_keyed_fallback == nullptr) { marker_keyed_fallback = cur_marker; } diff --git a/source/blender/blenkernel/intern/unit.cc b/source/blender/blenkernel/intern/unit.cc index 990ba410f97..53f1b845734 100644 --- a/source/blender/blenkernel/intern/unit.cc +++ b/source/blender/blenkernel/intern/unit.cc @@ -1851,7 +1851,7 @@ static size_t unit_as_string_main(char *str, if (split && unit_should_be_split(type)) { int length = unit_as_string_split_pair(str, str_maxncpy, value, prec, usys, main_unit); - /* Failed when length is negative, fallback to no split. */ + /* Failed when length is negative, fall back to no split. */ if (length >= 0) { return length; } diff --git a/source/blender/blenlib/BLI_bit_span_ops.hh b/source/blender/blenlib/BLI_bit_span_ops.hh index 584c24e9b63..e158cdacb33 100644 --- a/source/blender/blenlib/BLI_bit_span_ops.hh +++ b/source/blender/blenlib/BLI_bit_span_ops.hh @@ -51,7 +51,7 @@ inline void mix_into_first_expr(ExprFn &&expr, } } else { - /* Fallback or arbitrary bit spans. This could be implemented more efficiently but adds more + /* Fallback for arbitrary bit spans. This could be implemented more efficiently but adds more * complexity and is not necessary yet. */ for (const int64_t i : IndexRange(size)) { const bool result = expr(BitInt(first_arg[i].test()), BitInt(args[i].test())...) != 0; @@ -98,7 +98,7 @@ inline bool any_set_expr(ExprFn &&expr, const FirstBitSpanT &first_arg, const Bi return false; } else { - /* Fallback or arbitrary bit spans. This could be implemented more efficiently but adds more + /* Fallback for arbitrary bit spans. This could be implemented more efficiently but adds more * complexity and is not necessary yet. */ for (const int64_t i : IndexRange(size)) { const BitInt result = expr(BitInt(first_arg[i].test()), BitInt(args[i].test())...); @@ -177,7 +177,7 @@ inline void foreach_1_index_expr(ExprFn &&expr, } } else { - /* Fallback or arbitrary bit spans. This could be implemented more efficiently but adds more + /* Fallback for arbitrary bit spans. This could be implemented more efficiently but adds more * complexity and is not necessary yet. */ for (const int64_t i : IndexRange(size)) { const BitInt result = expr(BitInt(first_arg[i].test()), BitInt(args[i].test())...); diff --git a/source/blender/blenlib/BLI_math_quaternion.hh b/source/blender/blenlib/BLI_math_quaternion.hh index 985d05eef1f..5408e87cb60 100644 --- a/source/blender/blenlib/BLI_math_quaternion.hh +++ b/source/blender/blenlib/BLI_math_quaternion.hh @@ -285,7 +285,7 @@ template w[1] = math::sin(t * omega) / sinom; } else { - /* Fallback to lerp */ + /* Fall back to lerp */ w[0] = T(1) - t; w[1] = t; } diff --git a/source/blender/blenlib/BLI_probing_strategies.hh b/source/blender/blenlib/BLI_probing_strategies.hh index 4849c318038..1f265118249 100644 --- a/source/blender/blenlib/BLI_probing_strategies.hh +++ b/source/blender/blenlib/BLI_probing_strategies.hh @@ -155,7 +155,7 @@ template class PythonProbingS /** * Similar to the Python probing strategy. However, it does a bit more shuffling in the next() * method. This way more bits are taken into account earlier. After a couple of collisions (that - * should happen rarely), it will fallback to a sequence that hits every slot. + * should happen rarely), it will fall back to a sequence that hits every slot. */ template class ShuffleProbingStrategy { private: diff --git a/source/blender/blenlib/intern/math_rotation_c.cc b/source/blender/blenlib/intern/math_rotation_c.cc index 7d8a37b6960..176718c427b 100644 --- a/source/blender/blenlib/intern/math_rotation_c.cc +++ b/source/blender/blenlib/intern/math_rotation_c.cc @@ -881,7 +881,7 @@ void interp_dot_slerp(const float t, const float cosom, float r_w[2]) r_w[1] = sinf(t * omega) / sinom; } else { - /* fallback to lerp */ + /* fall back to lerp */ r_w[0] = 1.0f - t; r_w[1] = t; } diff --git a/source/blender/blenlib/intern/polyfill_2d.cc b/source/blender/blenlib/intern/polyfill_2d.cc index 28c4f6b7311..3717a713b7a 100644 --- a/source/blender/blenlib/intern/polyfill_2d.cc +++ b/source/blender/blenlib/intern/polyfill_2d.cc @@ -920,7 +920,7 @@ void BLI_polyfill_calc(const float (*coords)[2], const int coords_sign, uint32_t (*r_tris)[3]) { - /* Fallback to heap memory for large allocations. + /* Fall back to heap memory for large allocations. * Avoid running out of stack memory on systems with 512kb stack (macOS). * This happens at around 13,000 points, use a much lower value to be safe. */ if (UNLIKELY(coords_num > 8192)) { diff --git a/source/blender/bmesh/intern/bmesh_marking.cc b/source/blender/bmesh/intern/bmesh_marking.cc index db893828d3a..60b28a312df 100644 --- a/source/blender/bmesh/intern/bmesh_marking.cc +++ b/source/blender/bmesh/intern/bmesh_marking.cc @@ -1142,7 +1142,7 @@ bool BM_select_history_active_get(BMesh *bm, BMEditSelection *ese) } } else if (efa) { - /* no edit-selection, fallback to active face */ + /* no edit-selection, fall back to active face */ ese->ele = (BMElem *)efa; ese->htype = BM_FACE; } diff --git a/source/blender/bmesh/intern/bmesh_polygon.cc b/source/blender/bmesh/intern/bmesh_polygon.cc index b68d5830445..e4c1068f9d3 100644 --- a/source/blender/bmesh/intern/bmesh_polygon.cc +++ b/source/blender/bmesh/intern/bmesh_polygon.cc @@ -485,7 +485,7 @@ void BM_face_calc_tangent_from_edge_pair(const BMFace *f, float r_tangent[3]) /* Edges may not be opposite side of the ngon, * this could cause problems for ngons with multiple-aligned edges of the same length. - * Fallback to longest edge. */ + * Fall back to longest edge. */ if (UNLIKELY(normalize_v3(r_tangent) == 0.0f)) { normalize_v3_v3(r_tangent, vec_a); } diff --git a/source/blender/bmesh/intern/bmesh_query.hh b/source/blender/bmesh/intern/bmesh_query.hh index a864ddde852..364196ee65e 100644 --- a/source/blender/bmesh/intern/bmesh_query.hh +++ b/source/blender/bmesh/intern/bmesh_query.hh @@ -381,7 +381,7 @@ float BM_loop_calc_face_angle(const BMLoop *l) ATTR_WARN_UNUSED_RESULT ATTR_NONN /** * \brief BM_loop_calc_face_normal * - * Calculate the normal at this loop corner or fallback to the face normal on straight lines. + * Calculate the normal at this loop corner or fall back to the face normal on straight lines. * * \param l: The loop to calculate the normal at * \param r_normal: Resulting normal @@ -397,7 +397,7 @@ float BM_loop_calc_face_normal_safe(const BMLoop *l, float r_normal[3]) ATTR_NON /** * \brief BM_loop_calc_face_normal * - * Calculate the normal at this loop corner or fallback to the face normal on straight lines. + * Calculate the normal at this loop corner or fall back to the face normal on straight lines. * * \param l: The loop to calculate the normal at. * \param epsilon_sq: Value to avoid numeric errors (1e-5f works well). @@ -430,7 +430,7 @@ void BM_loop_calc_face_direction(const BMLoop *l, float r_dir[3]); /** * \brief BM_loop_calc_face_tangent * - * Calculate the tangent at this loop corner or fallback to the face normal on straight lines. + * Calculate the tangent at this loop corner or fall back to the face normal on straight lines. * This vector always points inward into the face. * * \param l: The loop to calculate the tangent at diff --git a/source/blender/bmesh/operators/bmo_primitive.cc b/source/blender/bmesh/operators/bmo_primitive.cc index 9dc5aae9200..328a902d67b 100644 --- a/source/blender/bmesh/operators/bmo_primitive.cc +++ b/source/blender/bmesh/operators/bmo_primitive.cc @@ -1526,7 +1526,7 @@ void BM_mesh_calc_uvs_cone(BMesh *bm, const float uv_center_x_bottom = cap_ends ? 0.75f : 0.5f; const float uv_radius = cap_ends ? 0.24f : 0.5f; - /* Using the opposite's end uv_scale as fallback allows us to handle 'real cone' case. */ + /* Using the opposite's end uv_scale as a fallback allows us to handle 'real cone' case. */ const float uv_scale_top = (radius_top != 0.0f) ? (uv_radius / radius_top) : ((radius_bottom != 0.0f) ? (uv_radius / radius_bottom) : diff --git a/source/blender/bmesh/operators/bmo_subdivide_edgering.cc b/source/blender/bmesh/operators/bmo_subdivide_edgering.cc index 21943fcb218..ac1257e7b2a 100644 --- a/source/blender/bmesh/operators/bmo_subdivide_edgering.cc +++ b/source/blender/bmesh/operators/bmo_subdivide_edgering.cc @@ -325,7 +325,7 @@ static void bm_vert_calc_surface_tangent(BMesh *bm, BMVert *v, float r_no[3]) BMIter eiter; BMEdge *e; - /* get outer normal, fallback to inner (if this vertex is on a boundary) */ + /* get outer normal, fall back to inner (if this vertex is on a boundary) */ bool found_outer = false, found_inner = false, found_outer_tag = false; float no_outer[3] = {0.0f}, no_inner[3] = {0.0f}; diff --git a/source/blender/compositor/intern/utilities.cc b/source/blender/compositor/intern/utilities.cc index 119e2a3d99b..098fecdf286 100644 --- a/source/blender/compositor/intern/utilities.cc +++ b/source/blender/compositor/intern/utilities.cc @@ -126,7 +126,7 @@ static ImplicitInput get_implicit_input(const nodes::SocketDeclaration *socket_d static int get_domain_priority(const bNodeSocket *input, const nodes::SocketDeclaration *socket_declaration) { - /* Negative priority means no priority is set and we fallback to the index, that is, we + /* Negative priority means no priority is set and we fall back to the index, that is, we * prioritize inputs according to their order. */ if (socket_declaration->compositor_domain_priority() < 0) { return input->index(); diff --git a/source/blender/compositor/shaders/compositor_bokeh_blur.glsl b/source/blender/compositor/shaders/compositor_bokeh_blur.glsl index 77081d457c2..7440599c7ab 100644 --- a/source/blender/compositor/shaders/compositor_bokeh_blur.glsl +++ b/source/blender/compositor/shaders/compositor_bokeh_blur.glsl @@ -10,8 +10,8 @@ float4 load_input(int2 texel) float4 color; if (extend_bounds) { /* If bounds are extended, then we treat the input as padded by a radius amount of pixels. So - * we load the input with an offset by the radius amount and fallback to a transparent color if - * it is out of bounds. */ + * we load the input with an offset by the radius amount and fall back to a transparent color + * if it is out of bounds. */ color = texture_load(input_tx, texel - radius, float4(0.0f)); } else { diff --git a/source/blender/compositor/shaders/compositor_symmetric_blur.glsl b/source/blender/compositor/shaders/compositor_symmetric_blur.glsl index 22470a1c1cb..61cc35fef87 100644 --- a/source/blender/compositor/shaders/compositor_symmetric_blur.glsl +++ b/source/blender/compositor/shaders/compositor_symmetric_blur.glsl @@ -7,7 +7,7 @@ /* Loads the input color of the pixel at the given texel. If bounds are extended, then the input is * treated as padded by a blur size amount of pixels of zero color, and the given texel is assumed * to be in the space of the image after padding. So we offset the texel by the blur radius amount - * and fallback to a zero color if it is out of bounds. For instance, if the input is padded by 5 + * and fall back to a zero color if it is out of bounds. For instance, if the input is padded by 5 * pixels to the left of the image, the first 5 pixels should be out of bounds and thus zero, hence * the introduced offset. */ float4 load_input(int2 texel) diff --git a/source/blender/compositor/shaders/compositor_symmetric_blur_variable_size.glsl b/source/blender/compositor/shaders/compositor_symmetric_blur_variable_size.glsl index bda294cf4ea..4947e39f6c9 100644 --- a/source/blender/compositor/shaders/compositor_symmetric_blur_variable_size.glsl +++ b/source/blender/compositor/shaders/compositor_symmetric_blur_variable_size.glsl @@ -8,7 +8,7 @@ /* Loads the input color of the pixel at the given texel. If bounds are extended, then the input is * treated as padded by a blur size amount of pixels of zero color, and the given texel is assumed * to be in the space of the image after padding. So we offset the texel by the blur radius amount - * and fallback to a zero color if it is out of bounds. For instance, if the input is padded by 5 + * and fall back to a zero color if it is out of bounds. For instance, if the input is padded by 5 * pixels to the left of the image, the first 5 pixels should be out of bounds and thus zero, hence * the introduced offset. */ float4 load_input(int2 texel) diff --git a/source/blender/compositor/shaders/compositor_symmetric_separable_blur.glsl b/source/blender/compositor/shaders/compositor_symmetric_separable_blur.glsl index ff918c148e9..2d74b93ca81 100644 --- a/source/blender/compositor/shaders/compositor_symmetric_separable_blur.glsl +++ b/source/blender/compositor/shaders/compositor_symmetric_separable_blur.glsl @@ -9,8 +9,8 @@ float4 load_input(int2 texel) float4 color; if (extend_bounds) { /* If bounds are extended, then we treat the input as padded by a radius amount of pixels. So - * we load the input with an offset by the radius amount and fallback to a transparent color if - * it is out of bounds. Notice that we subtract 1 because the weights texture have an extra + * we load the input with an offset by the radius amount and fall back to a transparent color + * if it is out of bounds. Notice that we subtract 1 because the weights texture have an extra * center weight, see the SymmetricSeparableBlurWeights for more information. */ int blur_size = texture_size(weights_tx).x - 1; color = texture_load(input_tx, texel - int2(blur_size, 0), float4(0.0f)); diff --git a/source/blender/compositor/shaders/library/gpu_shader_compositor_summed_area_table_lib.glsl b/source/blender/compositor/shaders/library/gpu_shader_compositor_summed_area_table_lib.glsl index ac27f39075f..746d5219fc3 100644 --- a/source/blender/compositor/shaders/library/gpu_shader_compositor_summed_area_table_lib.glsl +++ b/source/blender/compositor/shaders/library/gpu_shader_compositor_summed_area_table_lib.glsl @@ -35,7 +35,7 @@ * o-------+-----+------> * * The aforementioned equation eliminates the edges between regions X, C, and A since they get - * subtracted with C and A. To avoid this, we subtract 1 from the lower bound and fallback to zero + * subtracted with C and A. To avoid this, we subtract 1 from the lower bound and fall back to zero * for out of bound sampling. */ #include "gpu_shader_compositor_texture_utilities.glsl" diff --git a/source/blender/draw/engines/eevee/eevee_camera.cc b/source/blender/draw/engines/eevee/eevee_camera.cc index 3cfd141df6e..79833641c24 100644 --- a/source/blender/draw/engines/eevee/eevee_camera.cc +++ b/source/blender/draw/engines/eevee/eevee_camera.cc @@ -164,7 +164,7 @@ void Camera::sync() if (isnan(data.winmat.w.x)) { /* Can happen in weird corner case (see #134320). - * Simply fallback to something that we can render with. */ + * Simply fall back to something that we can render with. */ data.winmat = math::projection::orthographic(0.01f, 0.01f, 0.01f, 0.01f, -1000.0f, +1000.0f); } } diff --git a/source/blender/draw/engines/eevee/eevee_shader_shared.hh b/source/blender/draw/engines/eevee/eevee_shader_shared.hh index 2ed8fcdc17a..02925422665 100644 --- a/source/blender/draw/engines/eevee/eevee_shader_shared.hh +++ b/source/blender/draw/engines/eevee/eevee_shader_shared.hh @@ -837,7 +837,7 @@ enum LightingType : uint32_t { LIGHT_TRANSMISSION = 2u, LIGHT_VOLUME = 3u, /* WORKAROUND: Special value used to tag translucent BSDF with thickness. - * Fallback to LIGHT_DIFFUSE. */ + * Fall back to LIGHT_DIFFUSE. */ LIGHT_TRANSLUCENT_WITH_THICKNESS = 4u, }; diff --git a/source/blender/draw/engines/eevee/eevee_volume.cc b/source/blender/draw/engines/eevee/eevee_volume.cc index 1e71264375d..03cf56b60ff 100644 --- a/source/blender/draw/engines/eevee/eevee_volume.cc +++ b/source/blender/draw/engines/eevee/eevee_volume.cc @@ -31,7 +31,7 @@ void VolumeModule::init() int tile_size = clamp_i(scene_eval->eevee.volumetric_tile_size, 1, 16); int3 tex_size; - /* Try to match resolution setting but fallback to lower resolution + /* Try to match resolution setting but fall back to lower resolution * if it doesn't fit the hardware limits. */ for (; tile_size <= 16; tile_size *= 2) { /* Find Froxel Texture resolution. */ diff --git a/source/blender/draw/engines/eevee/shaders/eevee_attributes_volume_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_attributes_volume_lib.glsl index b74d7bbd91c..904cb89f517 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_attributes_volume_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_attributes_volume_lib.glsl @@ -23,7 +23,7 @@ SHADER_LIBRARY_CREATE_INFO(draw_modelmat) int g_attr_id = 0; /* Point clouds and curves are not compatible with volume grids. - * They will fallback to their own attributes loading. */ + * They will fall back to their own attributes loading. */ #if defined(MAT_VOLUME) && !defined(MAT_GEOM_CURVES) && !defined(MAT_GEOM_POINTCLOUD) # if defined(VOLUME_INFO_LIB) && !defined(MAT_GEOM_WORLD) # define GRID_ATTRIBUTES diff --git a/source/blender/draw/engines/eevee/shaders/eevee_nodetree_lib.glsl b/source/blender/draw/engines/eevee/shaders/eevee_nodetree_lib.glsl index c41b0c3389e..1aee35f0d9f 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_nodetree_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_nodetree_lib.glsl @@ -745,7 +745,7 @@ float texture_lod_bias_get() * \{ */ /* Point clouds and curves are not compatible with volume grids. - * They will fallback to their own attributes loading. */ + * They will fall back to their own attributes loading. */ #if defined(MAT_VOLUME) && !defined(MAT_GEOM_CURVES) && !defined(MAT_GEOM_POINTCLOUD) # if defined(VOLUME_INFO_LIB) && !defined(MAT_GEOM_WORLD) /* We could just check for GRID_ATTRIBUTES but this avoids for header dependency. */ diff --git a/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_planar_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_planar_comp.glsl index 4043f85bab5..2756e8f78f6 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_planar_comp.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_planar_comp.glsl @@ -104,7 +104,7 @@ void main() * This is faster than loading the gbuffer again and averages between reflected and normal * direction over many rays. */ float3 Ng = ray.direction; - /* Fallback to nearest light-probe. */ + /* Fall back to nearest light-probe. */ LightProbeSample samp = lightprobe_load(P, Ng, V); radiance = lightprobe_eval_direction(samp, P, ray.direction, ray_pdf_inv); /* Set point really far for correct reprojection of background. */ diff --git a/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_screen_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_screen_comp.glsl index 2b3bbec3370..3600693b915 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_screen_comp.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_ray_trace_screen_comp.glsl @@ -140,7 +140,7 @@ void main() * This is faster than loading the gbuffer again and averages between reflected and normal * direction over many rays. */ float3 Ng = ray.direction; - /* Fallback to nearest light-probe. */ + /* Fall back to nearest light-probe. */ LightProbeSample samp = lightprobe_load(ray.origin, Ng, V); /* Clamp SH to have parity with forward evaluation. */ float clamp_indirect = uniform_buf.clamp.surface_indirect; diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_update_comp.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_update_comp.glsl index 7b7ed3e4ae0..9effa64e990 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_update_comp.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_update_comp.glsl @@ -67,7 +67,7 @@ void main() else if (clipped > 0) { /* Not all verts are behind the near clip plane. */ if (intersect(frustum, box)) { - /* We cannot correctly handle this case so we fallback by covering the whole view. */ + /* We cannot correctly handle this case so we fall back by covering the whole view. */ aabb_ndc.max = float3(1.0f); aabb_ndc.min = float3(-1.0f); } diff --git a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_frag.glsl b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_frag.glsl index 481179cd733..5700fd52291 100644 --- a/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_frag.glsl +++ b/source/blender/draw/engines/eevee/shaders/eevee_shadow_tag_usage_frag.glsl @@ -104,7 +104,7 @@ void main() float3 ls_view_direction = normalize(drw_point_world_to_object(interp.P) - ls_near_plane); /* TODO (Miguel Pozo): We could try to ray-cast against the non-inflated bounds first, - * and fallback to the inflated ones if there is no hit. + * and fall back to the inflated ones if there is no hit. * The inflated bounds can cause unnecessary extra steps. */ float ls_near_box_t = ray_aabb( ls_near_plane, ls_view_direction, interp_flat.ls_aabb_min, interp_flat.ls_aabb_max); diff --git a/source/blender/draw/engines/overlay/overlay_fluid.hh b/source/blender/draw/engines/overlay/overlay_fluid.hh index ab163ded714..d4c8840c6fe 100644 --- a/source/blender/draw/engines/overlay/overlay_fluid.hh +++ b/source/blender/draw/engines/overlay/overlay_fluid.hh @@ -211,7 +211,7 @@ class Fluids : Overlay { sub_pass->push_constant("cell_filter", int(fds->gridlines_cell_filter)); break; } - /* Otherwise, fallback to none color type. */ + /* Otherwise, fall back to none color type. */ ATTR_FALLTHROUGH; case FLUID_GRIDLINE_COLOR_TYPE_NONE: sub_pass = grid_lines_flat_ps_; diff --git a/source/blender/draw/engines/overlay/overlay_private.hh b/source/blender/draw/engines/overlay/overlay_private.hh index 072d0fe2f88..5210231f140 100644 --- a/source/blender/draw/engines/overlay/overlay_private.hh +++ b/source/blender/draw/engines/overlay/overlay_private.hh @@ -911,7 +911,7 @@ struct Resources : public select::SelectMap { if (((G.moving & G_TRANSFORM_OBJ) != 0) && is_selected) { return TH_TRANSFORM; } - /* Sets the 'theme_id' or fallback to wire */ + /* Sets the 'theme_id' or fall back to wire */ if ((ob_ref.object->base_flag & BASE_SELECTED) != 0) { return (active) ? TH_ACTIVE : TH_SELECT; } diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.cc b/source/blender/draw/intern/draw_cache_impl_mesh.cc index 1cd4c53bca6..9267405a922 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.cc +++ b/source/blender/draw/intern/draw_cache_impl_mesh.cc @@ -267,7 +267,7 @@ static DRW_MeshCDMask mesh_cd_calc_used_gpu_layers(const Object &object, CustomData_get_named_layer(&cd_ldata, CD_PROP_FLOAT2, name) : CustomData_get_render_layer(&cd_ldata, CD_PROP_FLOAT2); - /* Only fallback to orco (below) when we have no UV layers, see: #56545 */ + /* Only fall back to orco (below) when we have no UV layers, see: #56545 */ if (layer == -1 && !name.is_empty()) { layer = CustomData_get_render_layer(&cd_ldata, CD_PROP_FLOAT2); } diff --git a/source/blender/editors/armature/armature_select.cc b/source/blender/editors/armature/armature_select.cc index d85245d942a..c97f3fe17ef 100644 --- a/source/blender/editors/armature/armature_select.cc +++ b/source/blender/editors/armature/armature_select.cc @@ -2273,7 +2273,7 @@ static wmOperatorStatus armature_shortest_path_pick_invoke(bContext *C, ebone_src = arm->act_edbone; ebone_dst = ED_armature_pick_ebone(C, event->mval, false, &base_dst); - /* fallback to object selection */ + /* fall back to object selection */ if (ELEM(nullptr, ebone_src, ebone_dst) || (ebone_src == ebone_dst)) { return OPERATOR_PASS_THROUGH; } diff --git a/source/blender/editors/curve/editcurve_paint.cc b/source/blender/editors/curve/editcurve_paint.cc index 5480590920a..886e09d229c 100644 --- a/source/blender/editors/curve/editcurve_paint.cc +++ b/source/blender/editors/curve/editcurve_paint.cc @@ -1133,7 +1133,7 @@ static wmOperatorStatus curve_draw_invoke(bContext *C, wmOperator *op, const wmE } } - /* use view plane (when set or as fallback when surface can't be found) */ + /* use view plane (when set or as a fallback when surface can't be found) */ if (cdd->project.use_depth == false) { plane_co = cdd->vc.scene->cursor.location; plane_no = rv3d->viewinv[2]; diff --git a/source/blender/editors/curves/intern/curves_draw.cc b/source/blender/editors/curves/intern/curves_draw.cc index 72faa22e4f3..479f6b52dce 100644 --- a/source/blender/editors/curves/intern/curves_draw.cc +++ b/source/blender/editors/curves/intern/curves_draw.cc @@ -1115,7 +1115,7 @@ static wmOperatorStatus curves_draw_invoke(bContext *C, wmOperator *op, const wm } } - /* use view plane (when set or as fallback when surface can't be found) */ + /* use view plane (when set or as a fallback when surface can't be found) */ if (cdd->project.use_depth == false) { plane_co = cdd->vc.scene->cursor.location; plane_no = rv3d->viewinv[2]; diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc index d17a04c0d96..e2cc6abf4c8 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc @@ -2735,8 +2735,8 @@ static wmOperatorStatus grease_pencil_paste_strokes_exec(bContext *C, wmOperator layers_to_paste_into[clip_layer_i] = &node->as_layer(); continue; } - else if (active_layer && active_layer->is_editable()) { - /* Fallback to active layer. */ + if (active_layer && active_layer->is_editable()) { + /* Fall back to active layer. */ BKE_report( op->reports, RPT_WARNING, "Couldn't find matching layer, pasting into active layer"); layers_to_paste_into[clip_layer_i] = active_layer; diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc index 71d471da257..5e7b192ff49 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc @@ -342,7 +342,7 @@ float3 DrawingPlacement::try_project_depth(const float2 co) const } float3 proj_point; - /* Fallback to `View` placement. */ + /* Fall back to `View` placement. */ ED_view3d_win_to_3d(view3d_, region_, placement_loc_, co, proj_point); return proj_point; } diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index 18abeb8ed23..11f0d0a1050 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -735,7 +735,7 @@ static int ui_but_calc_float_precision(uiBut *but, double value) /* first check for various special cases: * * If button is radians, we want additional precision (see #39861). - * * If prec is not set, we fallback to a simple default */ + * * If prec is not set, we fall back to a simple default */ if (ui_but_is_unit_radians(but) && prec < 5) { prec = 5; } @@ -1081,7 +1081,7 @@ static bool ui_but_update_from_old_block(uiBlock *block, oldbut_uptr = &oldblock->buttons[**but_old_idx]; } else { - /* Fallback to block search. */ + /* Fall back to block search. */ *but_old_idx = ui_but_find_old_idx(oldblock, but, matched_old_buttons); oldbut_uptr = but_old_idx->has_value() ? &oldblock->buttons[**but_old_idx] : nullptr; } diff --git a/source/blender/editors/interface/interface_align.cc b/source/blender/editors/interface/interface_align.cc index 6bfa2fd2093..ff9c6387a80 100644 --- a/source/blender/editors/interface/interface_align.cc +++ b/source/blender/editors/interface/interface_align.cc @@ -398,7 +398,7 @@ void ui_block_align_calc(uiBlock *block, const ARegion *region) /* Note that this is typically less than ~20, and almost always under ~100. * Even so, we can't ensure this value won't exceed available stack memory. - * Fallback to allocation instead of using #alloca, see: #78636. */ + * Fall back to allocation instead of using #alloca, see: #78636. */ ButAlign butal_array_buf[256]; if (num_buttons <= ARRAY_SIZE(butal_array_buf)) { butal_array = butal_array_buf; diff --git a/source/blender/editors/interface/interface_intern.hh b/source/blender/editors/interface/interface_intern.hh index 5fbd87e7653..716c8f19339 100644 --- a/source/blender/editors/interface/interface_intern.hh +++ b/source/blender/editors/interface/interface_intern.hh @@ -782,7 +782,7 @@ void ui_hsvcube_pos_from_vals( /** * \param float_precision: For number buttons the precision - * to use or -1 to fallback to the button default. + * to use or -1 to fall back to the button default. * \param use_exp_float: Use exponent representation of floats * when out of reasonable range (outside of 1e3/1e-3). */ diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc index 24d70e8c843..67049a395b4 100644 --- a/source/blender/editors/interface/interface_layout.cc +++ b/source/blender/editors/interface/interface_layout.cc @@ -1870,7 +1870,7 @@ static bool ui_item_rna_is_expand(PropertyRNA *prop, int index, const eUI_Item_F /** * Find first layout ancestor (or self) with a heading set. * - * \returns the layout to add the heading to as fallback (i.e. if it can't be placed in a split + * \returns the layout to add the heading to as a fallback (i.e. if it can't be placed in a split * layout). Its #uiLayout.heading member can be cleared to mark the heading as added (so * it's not added multiple times). Returns a pointer to the heading */ @@ -2198,7 +2198,7 @@ void uiLayout::prop(PointerRNA *ptr, } /* End split. */ else if (heading_layout) { - /* Could not add heading to split layout, fallback to inserting it to the layout with the + /* Could not add heading to split layout, fall back to inserting it to the layout with the * heading itself. */ ui_layout_heading_label_add(heading_layout, heading_layout, false, false); } diff --git a/source/blender/editors/interface/interface_widgets.cc b/source/blender/editors/interface/interface_widgets.cc index 9595d1fc68a..a9a5bf5cf63 100644 --- a/source/blender/editors/interface/interface_widgets.cc +++ b/source/blender/editors/interface/interface_widgets.cc @@ -2214,7 +2214,7 @@ static void widget_draw_text(const uiFontStyle *fstyle, int ul_index = -1; { - /* Find upper case, fallback to lower case. */ + /* Find upper case, fall back to lower case. */ const char *drawstr_end = drawstr_ofs + drawlen; const char keys[] = {char(but->menu_key - 32), but->menu_key}; for (int i = 0; i < ARRAY_SIZE(keys); i++) { diff --git a/source/blender/editors/interface/templates/interface_template_search_menu.cc b/source/blender/editors/interface/templates/interface_template_search_menu.cc index 98eef076c8a..ac9ea10c61d 100644 --- a/source/blender/editors/interface/templates/interface_template_search_menu.cc +++ b/source/blender/editors/interface/templates/interface_template_search_menu.cc @@ -719,7 +719,7 @@ static MenuSearch_Data *menu_items_from_ui_create(bContext *C, bool drawstr_is_empty = false; if (drawstr_sep != nullptr) { BLI_assert(str_buf.size() == 0); - /* Detect empty string, fallback to menu name. */ + /* Detect empty string, fall back to menu name. */ const char *drawstr = but->drawstr.c_str(); int drawstr_len = drawstr_sep - but->drawstr.c_str(); if (UNLIKELY(drawstr_len == 0)) { diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc index aaa747d3468..248033996fc 100644 --- a/source/blender/editors/screen/screen_ops.cc +++ b/source/blender/editors/screen/screen_ops.cc @@ -6090,7 +6090,7 @@ static std::string userpref_show_get_description(bContext *C, return fmt::format(fmt::runtime(TIP_("Show {} preferences")), section_name); } } - /* Fallback to default. */ + /* Fall back to default. */ return ""; } diff --git a/source/blender/editors/sculpt_paint/brush_asset_ops.cc b/source/blender/editors/sculpt_paint/brush_asset_ops.cc index 1b7509060e1..7aaf2300be6 100644 --- a/source/blender/editors/sculpt_paint/brush_asset_ops.cc +++ b/source/blender/editors/sculpt_paint/brush_asset_ops.cc @@ -770,7 +770,7 @@ static wmOperatorStatus brush_asset_revert_exec(bContext *C, wmOperator *op) BKE_paint_brush_set(paint, reinterpret_cast(reverted_id)); } else { - /* bke::asset_edit_id_revert() deleted the brush for sure, even on failure. Fallback to the + /* bke::asset_edit_id_revert() deleted the brush for sure, even on failure. Fall back to the * default. */ BKE_paint_brush_set_default(bmain, paint); } diff --git a/source/blender/editors/sculpt_paint/grease_pencil_interpolate.cc b/source/blender/editors/sculpt_paint/grease_pencil_interpolate.cc index a601b348cde..654ccc94400 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_interpolate.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_interpolate.cc @@ -499,7 +499,7 @@ static void assign_samples_to_segments(const int num_dst_points, } } else { - /* If source segment lengths are zero use uniform mapping by index as fallback. */ + /* If source segment lengths are zero use uniform mapping by index as a fallback. */ const float index_to_free_sample_count = math::safe_divide(float(num_free_samples), float(num_src_segments)); int samples_start = 0; diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.cc b/source/blender/editors/sculpt_paint/sculpt_expand.cc index b3bf82069be..d47953b2e7d 100644 --- a/source/blender/editors/sculpt_paint/sculpt_expand.cc +++ b/source/blender/editors/sculpt_paint/sculpt_expand.cc @@ -2185,7 +2185,7 @@ static bool set_initial_components_for_mouse(bContext *C, std::optional initial_vert = target_vert_update_and_get(C, ob, mval); if (!initial_vert) { - /* Cursor not over the mesh, for creating valid initial falloffs, fallback to the last active + /* Cursor not over the mesh, for creating valid initial falloffs, fall back to the last active * vertex in the sculpt session. */ const int last_active_vert_index = ss.last_active_vert_index(); /* It still may be the case that there is no last active vert in rare circumstances for diff --git a/source/blender/editors/space_action/action_data.cc b/source/blender/editors/space_action/action_data.cc index 31d5f6aa274..0c8dd5bcb16 100644 --- a/source/blender/editors/space_action/action_data.cc +++ b/source/blender/editors/space_action/action_data.cc @@ -468,7 +468,7 @@ static bool action_stash_create_poll(bContext *C) } } else { - /* There may not be any action/animdata yet, so, just fallback to the global setting + /* There may not be any action/animdata yet, so, just fall back to the global setting * (which may not be totally valid yet if the action editor was used and things are * now in an inconsistent state) */ diff --git a/source/blender/editors/space_file/fsmenu_system.cc b/source/blender/editors/space_file/fsmenu_system.cc index 1f407849c2c..652c5549693 100644 --- a/source/blender/editors/space_file/fsmenu_system.cc +++ b/source/blender/editors/space_file/fsmenu_system.cc @@ -58,7 +58,7 @@ struct FSMenu; /* -------------------------------------------------------------------- */ /** \name XDG User Directory Support (Unix) * - * Generic Unix, Use XDG when available, otherwise fallback to the home directory. + * Generic Unix, Use XDG when available, otherwise fall back to the home directory. * \{ */ /** diff --git a/source/blender/editors/space_file/space_file.cc b/source/blender/editors/space_file/space_file.cc index 2d1b8ff57f1..df98cf4e7bf 100644 --- a/source/blender/editors/space_file/space_file.cc +++ b/source/blender/editors/space_file/space_file.cc @@ -898,7 +898,7 @@ static void file_space_blend_read_data(BlendDataReader *reader, SpaceLink *sl) if (sfile->asset_params) { sfile->asset_params->base_params.rename_id = nullptr; /* Code (file-browser etc.) asserts that this setting is one of the currently known values. - * So fallback to #FILE_ASSET_IMPORT_FOLLOW_PREFS if it is not + * So fall back to #FILE_ASSET_IMPORT_FOLLOW_PREFS if it is not * (e.g. because of forward-compatibility while reading a blend-file from the future). */ switch (eFileAssetImportMethod(sfile->asset_params->import_method)) { case FILE_ASSET_IMPORT_LINK: diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc index c40171457ba..172a076d83e 100644 --- a/source/blender/editors/space_node/node_draw.cc +++ b/source/blender/editors/space_node/node_draw.cc @@ -1494,7 +1494,7 @@ void node_socket_color_get(const bContext &C, float r_color[4]) { if (!sock.typeinfo->draw_color) { - /* Fallback to the simple variant. If not defined either, fallback to a magenta color. */ + /* Fall back to the simple variant. If not defined either, fall back to a magenta color. */ if (sock.typeinfo->draw_color_simple) { sock.typeinfo->draw_color_simple(sock.typeinfo, r_color); } diff --git a/source/blender/editors/space_node/node_geometry_attribute_search.cc b/source/blender/editors/space_node/node_geometry_attribute_search.cc index e8f248b0450..45cdd39c976 100644 --- a/source/blender/editors/space_node/node_geometry_attribute_search.cc +++ b/source/blender/editors/space_node/node_geometry_attribute_search.cc @@ -138,7 +138,7 @@ static void attribute_search_update_fn( /** * Some custom data types don't correspond to node types and therefore can't be - * used by the named attribute input node. Find the best option or fallback to float. + * used by the named attribute input node. Find the best option or fall back to float. */ static eCustomDataType data_type_in_attribute_input_node(const eCustomDataType type) { diff --git a/source/blender/editors/space_view3d/view3d_context.cc b/source/blender/editors/space_view3d/view3d_context.cc index 19e2478b2f0..ba38d302495 100644 --- a/source/blender/editors/space_view3d/view3d_context.cc +++ b/source/blender/editors/space_view3d/view3d_context.cc @@ -30,7 +30,7 @@ const char *view3d_context_dir[] = { int view3d_context(const bContext *C, const char *member, bContextDataResult *result) { - /* fallback to the scene layer, + /* fall back to the scene layer, * allows duplicate and other object operators to run outside the 3d view */ if (CTX_data_dir(member)) { diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc b/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc index 5f9b9c40ac5..2c7d3b04e28 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc @@ -42,7 +42,7 @@ static wmOperatorStatus viewcenter_pick_invoke(bContext *C, wmOperator *op, cons /* pass */ } else { - /* fallback to simple pan */ + /* fall back to simple pan */ negate_v3_v3(ofs_new, rv3d->ofs); ED_view3d_win_to_3d_int(v3d, region, ofs_new, event->mval, ofs_new); } diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_ndof.cc b/source/blender/editors/space_view3d/view3d_navigate_view_ndof.cc index 58a46e687e3..6d184c0e2ee 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_ndof.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_ndof.cc @@ -667,7 +667,7 @@ static wmOperatorStatus ndof_orbit_invoke_impl(bContext *C, if (ndof->progress != P_FINISHING) { const bool has_rotation = ndof_has_rotate(ndof, rv3d); - /* if we can't rotate, fallback to translate (locked axis views) */ + /* if we can't rotate, fall back to translate (locked axis views) */ const bool has_translate = ndof_has_translate(ndof, v3d, rv3d) && (RV3D_LOCK_FLAGS(rv3d) & RV3D_LOCK_ROTATION); const bool has_zoom = (ndof->tvec[2] != 0.0f) && !rv3d->is_persp; @@ -772,7 +772,7 @@ static wmOperatorStatus ndof_orbit_zoom_invoke_impl(bContext *C, } } else if ((rv3d->persp == RV3D_ORTHO) && RV3D_VIEW_IS_AXIS(rv3d->view)) { - /* if we can't rotate, fallback to translate (locked axis views) */ + /* if we can't rotate, fall back to translate (locked axis views) */ const bool has_translate = ndof_has_translate(ndof, v3d, rv3d); const bool has_zoom = (ndof->tvec[2] != 0.0f) && ED_view3d_offset_lock_check(v3d, rv3d); diff --git a/source/blender/editors/space_view3d/view3d_navigate_zoom_border.cc b/source/blender/editors/space_view3d/view3d_navigate_zoom_border.cc index a92ae13c9f9..89421e8bca1 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_zoom_border.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_zoom_border.cc @@ -130,7 +130,7 @@ static wmOperatorStatus view3d_zoom_border_exec(bContext *C, wmOperator *op) float xy_delta[2]; float zfac; - /* We can't use the depth, fallback to the old way that doesn't set the center depth */ + /* We can't use the depth, fall back to the old way that doesn't set the center depth */ copy_v3_v3(ofs_new, rv3d->ofs); { diff --git a/source/blender/editors/transform/transform_convert.hh b/source/blender/editors/transform/transform_convert.hh index 906b9762ed7..d5e1079f2cb 100644 --- a/source/blender/editors/transform/transform_convert.hh +++ b/source/blender/editors/transform/transform_convert.hh @@ -152,7 +152,7 @@ void transform_convert_sequencer_channel_clamp(TransInfo *t, float r_val[2]); bool transform_mode_use_local_origins(const TransInfo *t); /** - * Transforming around ourselves is no use, fallback to individual origins, + * Transforming around ourselves is no use, fall back to individual origins, * useful for curve/armatures. */ void transform_around_single_fallback_ex(TransInfo *t, int data_len_all); diff --git a/source/blender/editors/transform/transform_snap.cc b/source/blender/editors/transform/transform_snap.cc index 08ed5559ed1..1dc6421a761 100644 --- a/source/blender/editors/transform/transform_snap.cc +++ b/source/blender/editors/transform/transform_snap.cc @@ -519,7 +519,7 @@ void transform_snap_project_individual_apply(TransInfo *t) } /* If both face ray-cast and face nearest methods are enabled, start with face ray-cast and - * fallback to face nearest ray-cast does not hit. */ + * fall back to face nearest ray-cast does not hit. */ bool hit = false; if (t->tsnap.mode & SCE_SNAP_INDIVIDUAL_PROJECT) { hit = applyFaceProject(t, tc, td); diff --git a/source/blender/editors/util/numinput.cc b/source/blender/editors/util/numinput.cc index a5355b182ed..9e4c19eceb6 100644 --- a/source/blender/editors/util/numinput.cc +++ b/source/blender/editors/util/numinput.cc @@ -547,7 +547,7 @@ bool handleNumInput(bContext *C, NumInput *n, const wmEvent *event) } if ((!utf8_buf || !utf8_buf[0]) && ascii[0]) { - /* Fallback to ascii. */ + /* Fall back to ascii. */ utf8_buf = ascii; } diff --git a/source/blender/functions/intern/multi_function_procedure_executor.cc b/source/blender/functions/intern/multi_function_procedure_executor.cc index 4492210bfe5..2fe7bcfe358 100644 --- a/source/blender/functions/intern/multi_function_procedure_executor.cc +++ b/source/blender/functions/intern/multi_function_procedure_executor.cc @@ -174,7 +174,7 @@ class ValueAllocator : NonCopyable, NonMovable { const int64_t alignment = type.alignment; if (alignment > min_alignment) { - /* In this rare case we fallback to not reusing existing buffers. */ + /* In this rare case we fall back to not reusing existing buffers. */ buffer = linear_allocator_.allocate(element_size * size, alignment); } else { diff --git a/source/blender/gpu/GPU_context.hh b/source/blender/gpu/GPU_context.hh index 9276913959c..b08fa9372fd 100644 --- a/source/blender/gpu/GPU_context.hh +++ b/source/blender/gpu/GPU_context.hh @@ -27,7 +27,7 @@ eGPUBackendType GPU_backend_get_type(); * - The detected backend will be set in `GPU_backend_type_selection_set`. * - When GPU_backend_type_selection_is_overridden it checks the overridden backend. * When not overridden it checks a default list. - * - OpenGL backend will be checked as fallback for Metal. + * - OpenGL backend will be checked as a fallback for Metal. * * Returns true when detection found a supported backend, otherwise returns false. * When no supported backend is found GPU_backend_type_selection_set is called with diff --git a/source/blender/gpu/shaders/material/gpu_shader_material_sheen.glsl b/source/blender/gpu/shaders/material/gpu_shader_material_sheen.glsl index a4e5eb17d0b..55dd95640a6 100644 --- a/source/blender/gpu/shaders/material/gpu_shader_material_sheen.glsl +++ b/source/blender/gpu/shaders/material/gpu_shader_material_sheen.glsl @@ -8,7 +8,7 @@ void node_bsdf_sheen(float4 color, float roughness, float3 N, float weight, out roughness = saturate(roughness); N = safe_normalize(N); - /* Fallback to diffuse. */ + /* Fall back to diffuse. */ ClosureDiffuse diffuse_data; diffuse_data.weight = weight; diffuse_data.color = color.rgb; diff --git a/source/blender/gpu/shaders/material/gpu_shader_material_toon.glsl b/source/blender/gpu/shaders/material/gpu_shader_material_toon.glsl index 7acc707aaf0..6b7fc997119 100644 --- a/source/blender/gpu/shaders/material/gpu_shader_material_toon.glsl +++ b/source/blender/gpu/shaders/material/gpu_shader_material_toon.glsl @@ -8,7 +8,7 @@ void node_bsdf_toon( color = max(color, float4(0.0f)); N = safe_normalize(N); - /* Fallback to diffuse. */ + /* Fall back to diffuse. */ ClosureDiffuse diffuse_data; diffuse_data.weight = weight; diffuse_data.color = color.rgb; diff --git a/source/blender/gpu/vulkan/vk_descriptor_set.cc b/source/blender/gpu/vulkan/vk_descriptor_set.cc index 39bc8d34e9f..398b88e38cd 100644 --- a/source/blender/gpu/vulkan/vk_descriptor_set.cc +++ b/source/blender/gpu/vulkan/vk_descriptor_set.cc @@ -190,7 +190,7 @@ void VKDescriptorSetTracker::bind_input_attachment_resource( VK_REMAINING_ARRAY_LAYERS}); } else { - /* Fallback to render-passes / sub-passes. */ + /* Fall back to render-passes / sub-passes. */ bind_image(VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT, VK_NULL_HANDLE, texture->image_view_get(resource_binding.arrayed, VKImageViewFlags::NO_SWIZZLING) diff --git a/source/blender/gpu/vulkan/vk_push_constants.hh b/source/blender/gpu/vulkan/vk_push_constants.hh index c2d8bef6b07..70da648c759 100644 --- a/source/blender/gpu/vulkan/vk_push_constants.hh +++ b/source/blender/gpu/vulkan/vk_push_constants.hh @@ -11,7 +11,7 @@ * means it is still very little (for example 256 bytes). * * Due to this size requirements we try to use push constants when it fits on the device. If it - * doesn't fit we fallback to use an uniform buffer. + * doesn't fit we fall back to use an uniform buffer. * * Shader developers are responsible to fine-tune the performance of the shader. One way to do this * is to tailor what will be sent as a push constant to keep the push constants within the limits. diff --git a/source/blender/gpu/vulkan/vk_shader_interface.cc b/source/blender/gpu/vulkan/vk_shader_interface.cc index ca89d2adc4b..173dcc002f6 100644 --- a/source/blender/gpu/vulkan/vk_shader_interface.cc +++ b/source/blender/gpu/vulkan/vk_shader_interface.cc @@ -106,7 +106,7 @@ void VKShaderInterface::init(const shader::ShaderCreateInfo &info) input++; } } - /* Add push constant when using uniform buffer as fallback. */ + /* Add push constant when using uniform buffer as a fallback. */ int32_t push_constants_fallback_location = -1; if (push_constants_storage_type == VKPushConstants::StorageType::UNIFORM_BUFFER) { copy_input_name(input, PUSH_CONSTANTS_FALLBACK_NAME, name_buffer_, name_buffer_offset); diff --git a/source/blender/imbuf/intern/util_gpu.cc b/source/blender/imbuf/intern/util_gpu.cc index da848b5bf8f..5f22aab62e6 100644 --- a/source/blender/imbuf/intern/util_gpu.cc +++ b/source/blender/imbuf/intern/util_gpu.cc @@ -358,7 +358,7 @@ GPUTexture *IMB_create_gpu_texture(const char *name, fprintf(stderr, "ST3C support not found,"); } - /* Fallback to uncompressed texture. */ + /* Fall back to uncompressed texture. */ fprintf(stderr, " falling back to uncompressed (%s, %ix%i).\n", name, ibuf->x, ibuf->y); } diff --git a/source/blender/imbuf/movie/intern/movie_write.cc b/source/blender/imbuf/movie/intern/movie_write.cc index 88f3d3d52a8..7ff6c883bf2 100644 --- a/source/blender/imbuf/movie/intern/movie_write.cc +++ b/source/blender/imbuf/movie/intern/movie_write.cc @@ -348,7 +348,7 @@ static const AVCodec *get_av1_encoder( * where using a different encoder is desirable, such as in #103849. */ codec = avcodec_find_encoder_by_name("librav1e"); if (!codec) { - /* Fallback to `libaom-av1` if librav1e is not found. */ + /* Fall back to `libaom-av1` if librav1e is not found. */ codec = avcodec_find_encoder_by_name("libaom-av1"); } break; diff --git a/source/blender/io/usd/intern/usd_skel_convert.cc b/source/blender/io/usd/intern/usd_skel_convert.cc index 99704411c29..9066cf07180 100644 --- a/source/blender/io/usd/intern/usd_skel_convert.cc +++ b/source/blender/io/usd/intern/usd_skel_convert.cc @@ -864,7 +864,7 @@ void import_skeleton(Main *bmain, } } - /* Use our custom bone length data if possible, otherwise fallback to estimated lengths. */ + /* Use our custom bone length data if possible, otherwise fall back to estimated lengths. */ const pxr::UsdGeomPrimvarsAPI pv_api = pxr::UsdGeomPrimvarsAPI(skel.GetPrim()); const pxr::UsdGeomPrimvar pv_lengths = pv_api.GetPrimvar(BlenderBoneLengths); if (pv_lengths.HasValue()) { diff --git a/source/blender/makesdna/DNA_anim_types.h b/source/blender/makesdna/DNA_anim_types.h index f650f244111..44a9e3c7727 100644 --- a/source/blender/makesdna/DNA_anim_types.h +++ b/source/blender/makesdna/DNA_anim_types.h @@ -230,7 +230,7 @@ typedef struct DriverTarget { * This is a value of enumerator #eDriverTarget_ContextProperty. */ int context_property; - /* Fallback value to use with DTAR_OPTION_USE_FALLBACK. */ + /* Fall back value to use with DTAR_OPTION_USE_FALLBACK. */ float fallback_value; } DriverTarget; diff --git a/source/blender/makesdna/DNA_workspace_types.h b/source/blender/makesdna/DNA_workspace_types.h index 7c4f9e103e0..5f45c8f5e42 100644 --- a/source/blender/makesdna/DNA_workspace_types.h +++ b/source/blender/makesdna/DNA_workspace_types.h @@ -82,7 +82,7 @@ typedef struct bToolRef { * - This can be used to synchronize tools between areas (if necessary). * - If the tool doesn't exist, the exiting tool will left as is. * - There is no need for a "fallback" version of this variable - * since activating the tool will also set it's fallback, if it's defined. + * since activating the tool will also set its fallback, if it's defined. * - This is not stored in the run-time because it's possible (for example) * for a request to sync to another area isn't handled if the area isn't visible. * So store this in the file, so the pending change can be performed when the area is shown. diff --git a/source/blender/makesrna/intern/rna_wm.cc b/source/blender/makesrna/intern/rna_wm.cc index d67247802f1..592f9a18b49 100644 --- a/source/blender/makesrna/intern/rna_wm.cc +++ b/source/blender/makesrna/intern/rna_wm.cc @@ -3048,7 +3048,7 @@ static void rna_def_keyconfig(BlenderRNA *brna) RNA_def_property_update(prop, 0, "rna_KeyMapItem_update"); /* this is in fact the operator name, but if the operator can't be found we - * fallback on the operator ID */ + * fall back on the operator ID */ prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE); RNA_def_property_clear_flag(prop, PROP_EDITABLE); RNA_def_property_ui_text(prop, "Name", "Name of operator (translated) to call on input event"); diff --git a/source/blender/modifiers/intern/MOD_displace.cc b/source/blender/modifiers/intern/MOD_displace.cc index 604673dc62d..24bd24acf38 100644 --- a/source/blender/modifiers/intern/MOD_displace.cc +++ b/source/blender/modifiers/intern/MOD_displace.cc @@ -162,7 +162,7 @@ static void displaceModifier_do_task(void *__restrict userdata, float(*tex_co)[3] = data->tex_co; blender::MutableSpan positions = data->positions; - /* When no texture is used, we fallback to white. */ + /* When no texture is used, we fall back to white. */ const float delta_fixed = 1.0f - dmd->midlevel; TexResult texres; diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_build.cc b/source/blender/modifiers/intern/MOD_grease_pencil_build.cc index 679a59963d6..0fa8496c838 100644 --- a/source/blender/modifiers/intern/MOD_grease_pencil_build.cc +++ b/source/blender/modifiers/intern/MOD_grease_pencil_build.cc @@ -558,7 +558,7 @@ static float get_build_factor(const GreasePencilBuildTimeMode time_mode, return percentage * (1.0f + fade); case MOD_GREASE_PENCIL_BUILD_TIMEMODE_DRAWSPEED: /* The "drawing speed" is written as an attribute called 'delta_time' (for each point). If - * this attribute doesn't exist, we fallback to the "frames" mode. */ + * this attribute doesn't exist, we fall back to the "frames" mode. */ if (!curves.attributes().contains("delta_time")) { return build_factor_frames; } diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_util.cc b/source/blender/modifiers/intern/MOD_grease_pencil_util.cc index 8adf95fa132..e5f3e0469bb 100644 --- a/source/blender/modifiers/intern/MOD_grease_pencil_util.cc +++ b/source/blender/modifiers/intern/MOD_grease_pencil_util.cc @@ -354,7 +354,7 @@ VArray get_influence_vertex_weights(const bke::CurvesGeometry &curves, /* If vertex group is not set, use full weight for all vertices. */ return VArray::ForSingle(1.0f, curves.point_num); } - /* Vertex group weights, with zero weight as fallback. */ + /* Vertex group weights, with zero weight as a fallback. */ VArray influence_weights = *curves.attributes().lookup_or_default( influence_data.vertex_group_name, bke::AttrDomain::Point, 0.0f); diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.cc b/source/blender/nodes/composite/nodes/node_composite_blur.cc index 50324db2c47..7e0e3df974d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_blur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_blur.cc @@ -344,7 +344,7 @@ class BlurOperation : public NodeOperation { /* Loads the input color of the pixel at the given texel. If bounds are extended, then the input * is treated as padded by a blur size amount of pixels of zero color, and the given texel is * assumed to be in the space of the image after padding. So we offset the texel by the blur - * radius amount and fallback to a zero color if it is out of bounds. For instance, if the input + * radius amount and fall back to a zero color if it is out of bounds. For instance, if the input * is padded by 5 pixels to the left of the image, the first 5 pixels should be out of bounds and * thus zero, hence the introduced offset. */ float4 load_input(const Result &input, diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc index 2193a80fc02..b0d447086fb 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc @@ -125,7 +125,7 @@ class BokehBlurOperation : public NodeOperation { auto load_input = [&](const int2 texel) { /* If bounds are extended, then we treat the input as padded by a radius amount of pixels. - * So we load the input with an offset by the radius amount and fallback to a transparent + * So we load the input with an offset by the radius amount and fall back to a transparent * color if it is out of bounds. */ if (extend_bounds) { return input.load_pixel_zero(texel - radius); diff --git a/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc b/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc index aaa136095e7..41fbf6e4e91 100644 --- a/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc +++ b/source/blender/nodes/composite/nodes/node_composite_cornerpin.cc @@ -276,8 +276,8 @@ class CornerPinOperation : public NodeOperation { float2 upper_right = get_input("Upper Right").get_single_value_default(float3(0.0f)).xy(); float2 upper_left = get_input("Upper Left").get_single_value_default(float3(0.0f)).xy(); - /* The inputs are invalid because the plane is not convex, fallback to an identity operation in - * that case. */ + /* The inputs are invalid because the plane is not convex, fall back to an identity operation + * in that case. */ if (!is_quad_convex_v2(lower_left, lower_right, upper_right, upper_left)) { return float3x3::identity(); } diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc index d0b76b2489c..51b9467a95c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc @@ -843,7 +843,7 @@ class CryptoMatteOperation : public BaseCryptoMatteOperation { } /* The domain should be centered with the same size as the source. In case of invalid source, - * fallback to the domain inferred from the input. */ + * fall back to the domain inferred from the input. */ Domain compute_domain() override { switch (get_source()) { @@ -858,7 +858,7 @@ class CryptoMatteOperation : public BaseCryptoMatteOperation { } /* In case of an image source, the domain should be centered with the same size as the source - * image. In case of an invalid image, fallback to the domain inferred from the input. */ + * image. In case of an invalid image, fall back to the domain inferred from the input. */ Domain compute_image_domain() { BLI_assert(get_source() == CMP_NODE_CRYPTOMATTE_SOURCE_IMAGE); diff --git a/source/blender/nodes/composite/nodes/node_composite_defocus.cc b/source/blender/nodes/composite/nodes/node_composite_defocus.cc index fc07a1c932e..ab1720b5557 100644 --- a/source/blender/nodes/composite/nodes/node_composite_defocus.cc +++ b/source/blender/nodes/composite/nodes/node_composite_defocus.cc @@ -433,7 +433,7 @@ class DefocusOperation : public NodeOperation { return (focal_length * focus_distance) / (focus_distance - focal_length); } - /* Returns the focal length in meters. Fallback to 50 mm in case of an invalid camera. Ensure a + /* Returns the focal length in meters. Fall back to 50 mm in case of an invalid camera. Ensure a * minimum of 1e-6. */ float get_focal_length() { @@ -453,7 +453,7 @@ class DefocusOperation : public NodeOperation { } /* Computes the number of pixels per meter of the sensor size. This is essentially the resolution - * over the sensor size, using the sensor fit axis. Fallback to DEFAULT_SENSOR_WIDTH in case of + * over the sensor size, using the sensor fit axis. Fall back to DEFAULT_SENSOR_WIDTH in case of * an invalid camera. Note that the stored sensor size is in millimeter, so convert to meters. */ float compute_pixels_per_meter() { @@ -480,7 +480,7 @@ class DefocusOperation : public NodeOperation { return default_value; } - /* Returns the f-stop number. Fallback to 1e-3 for zero f-stop. */ + /* Returns the f-stop number. Fall back to 1e-3 for zero f-stop. */ float get_f_stop() { return math::max(1e-3f, node_storage(bnode()).fstop); diff --git a/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc b/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc index 45b2083b42d..7e1b6c6dfdb 100644 --- a/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc +++ b/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc @@ -668,7 +668,7 @@ class ConvertKuwaharaOperation : public NodeOperation { weighted_sum += color_mean * weight; } - /* Fallback to the original color if all sector weights are zero due to very high standard + /* Fall back to the original color if all sector weights are zero due to very high standard * deviation and sharpness. */ if (sum_of_weights == 0.0f) { weighted_sum = center_color; diff --git a/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc b/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc index 3c0e8559fed..28276325248 100644 --- a/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc +++ b/source/blender/nodes/composite/nodes/node_composite_val_to_rgb.cc @@ -96,7 +96,7 @@ static int node_gpu_material(GPUMaterial *material, GPU_uniform(&color_band->data[1].r)); case COLBAND_INTERP_B_SPLINE: case COLBAND_INTERP_CARDINAL: - /* Not optimized yet. Fallback to gradient texture. */ + /* Not optimized yet. Fall back to gradient texture. */ break; } } diff --git a/source/blender/nodes/composite/nodes/node_composite_viewer.cc b/source/blender/nodes/composite/nodes/node_composite_viewer.cc index b0b1290ead8..42c44ca95f8 100644 --- a/source/blender/nodes/composite/nodes/node_composite_viewer.cc +++ b/source/blender/nodes/composite/nodes/node_composite_viewer.cc @@ -164,7 +164,7 @@ class ViewerOperation : public NodeOperation { /* Otherwise, use the domain of the input as is. */ const Domain domain = NodeOperation::compute_domain(); - /* Fallback to the compositing region size in case of a single value domain. */ + /* Fall back to the compositing region size in case of a single value domain. */ return domain.size == int2(1) ? Domain(context().get_compositing_region_size()) : domain; } }; diff --git a/source/blender/python/intern/bpy_rna.cc b/source/blender/python/intern/bpy_rna.cc index 5fc24eab6b5..a92b370f979 100644 --- a/source/blender/python/intern/bpy_rna.cc +++ b/source/blender/python/intern/bpy_rna.cc @@ -4749,7 +4749,7 @@ static int pyrna_struct_meta_idprop_setattro(PyObject *cls, PyObject *attr, PyOb } } - /* Fallback to standard Python's `delattr/setattr`. */ + /* Fall back to standard Python's `delattr/setattr`. */ return PyType_Type.tp_setattro(cls, attr, value); } @@ -5708,7 +5708,7 @@ static PyObject *foreach_getset(BPy_PropertyRNA *self, PyObject *args, int set) } } - /* Could not use the buffer, fallback to sequence. */ + /* Could not use the buffer, fall back to sequence. */ if (!buffer_is_compat) { array = PyMem_Malloc(size * tot); @@ -5784,7 +5784,7 @@ static PyObject *foreach_getset(BPy_PropertyRNA *self, PyObject *args, int set) } } - /* Could not use the buffer, fallback to sequence. */ + /* Could not use the buffer, fall back to sequence. */ if (!buffer_is_compat) { array = PyMem_Malloc(size * tot); diff --git a/source/blender/render/intern/render_result.cc b/source/blender/render/intern/render_result.cc index 2e59b5e3ffb..8f3651c489d 100644 --- a/source/blender/render/intern/render_result.cc +++ b/source/blender/render/intern/render_result.cc @@ -182,7 +182,7 @@ static int get_num_planes_for_pass_ibuf(const RenderPass &render_pass) return R_IMF_PLANES_RGBA; } - /* Fallback to a commonly used default value of planes for odd-ball number of channel. */ + /* Fall back to a commonly used default value of planes for odd-ball number of channel. */ return R_IMF_PLANES_RGBA; } diff --git a/source/blender/sequencer/intern/render.cc b/source/blender/sequencer/intern/render.cc index 3f008546447..f6424b12dcd 100644 --- a/source/blender/sequencer/intern/render.cc +++ b/source/blender/sequencer/intern/render.cc @@ -1240,7 +1240,7 @@ static ImBuf *seq_render_movieclip_strip(const RenderData *context, /* Try to get a proxy image. */ ibuf = seq_get_movieclip_ibuf(strip, user); - /* If clip doesn't use proxies, it will fallback to full size render of original file. */ + /* If clip doesn't use proxies, it will fall back to full size render of original file. */ if (ibuf != nullptr && psize != IMB_PROXY_NONE && BKE_movieclip_proxy_enabled(strip->clip)) { *r_is_proxy_image = true; } diff --git a/source/blender/windowmanager/gizmo/WM_gizmo_types.hh b/source/blender/windowmanager/gizmo/WM_gizmo_types.hh index cf9ec75bd2d..c55c56d040a 100644 --- a/source/blender/windowmanager/gizmo/WM_gizmo_types.hh +++ b/source/blender/windowmanager/gizmo/WM_gizmo_types.hh @@ -130,7 +130,7 @@ enum eWM_GizmoFlagGroupTypeFlag { WM_GIZMOGROUPTYPE_TOOL_INIT = (1 << 7), /** - * This gizmo type supports using the fallback tools keymap. + * This gizmo type supports using the fall back tools keymap. * #wmGizmoGroup.use_tool_fallback will need to be set too. * * Often useful in combination with #WM_GIZMOGROUPTYPE_DELAY_REFRESH_FOR_TWEAK diff --git a/source/blender/windowmanager/intern/wm.cc b/source/blender/windowmanager/intern/wm.cc index b1b19bece3f..86ca0353496 100644 --- a/source/blender/windowmanager/intern/wm.cc +++ b/source/blender/windowmanager/intern/wm.cc @@ -190,7 +190,7 @@ static void window_manager_blend_read_data(BlendDataReader *reader, ID *id) win->event_queue_consecutive_gesture_data = nullptr; BLO_read_struct(reader, Stereo3dFormat, &win->stereo3d_format); - /* Multi-view always fallback to anaglyph at file opening + /* Multi-view always falls back to anaglyph at file opening * otherwise quad-buffer saved files can break Blender. */ if (win->stereo3d_format) { win->stereo3d_format->display_mode = S3D_DISPLAY_ANAGLYPH; diff --git a/source/blender/windowmanager/intern/wm_cursors.cc b/source/blender/windowmanager/intern/wm_cursors.cc index 7608e644e37..907cd01da5f 100644 --- a/source/blender/windowmanager/intern/wm_cursors.cc +++ b/source/blender/windowmanager/intern/wm_cursors.cc @@ -211,7 +211,7 @@ void WM_cursor_set(wmWindow *win, int curs) window_set_custom_cursor(win, bcursor); } else { - /* Fallback to default cursor if no bitmap found. */ + /* Fall back to default cursor if no bitmap found. */ GHOST_SetCursorShape(static_cast(win->ghostwin), GHOST_kStandardCursorDefault); } diff --git a/source/blender/windowmanager/intern/wm_event_system.cc b/source/blender/windowmanager/intern/wm_event_system.cc index 0f5defebdb1..58f313ceef4 100644 --- a/source/blender/windowmanager/intern/wm_event_system.cc +++ b/source/blender/windowmanager/intern/wm_event_system.cc @@ -3350,7 +3350,7 @@ static eHandlerActionFlag wm_handlers_do_gizmo_handler(bContext *C, /* Don't use from now on. */ gz = nullptr; - /* Fallback to selected gizmo (when un-handled). */ + /* Fall back to selected gizmo (when un-handled). */ if ((action & WM_HANDLER_BREAK) == 0) { if (WM_gizmomap_is_any_selected(gzmap)) { const ListBase *groups = WM_gizmomap_group_list(gzmap); @@ -4388,7 +4388,7 @@ static wmWindow *wm_event_find_fileselect_root_window_from_context(const bContex } } - /* Fallback to the first window. */ + /* Fall back to the first window. */ const wmWindowManager *wm = CTX_wm_manager(C); BLI_assert(!ED_fileselect_handler_area_find_any_with_op( static_cast(wm->windows.first))); @@ -6672,7 +6672,7 @@ void WM_window_cursor_keymap_status_refresh(bContext *C, wmWindow *win) { return; } - /* Fallback to window. */ + /* Fall back to window. */ if (ELEM(region->regiontype, RGN_TYPE_TOOLS, RGN_TYPE_TOOL_PROPS)) { region = BKE_area_find_region_type(area, RGN_TYPE_WINDOW); } diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc index fe205da880b..65ae156b745 100644 --- a/source/blender/windowmanager/intern/wm_files.cc +++ b/source/blender/windowmanager/intern/wm_files.cc @@ -535,7 +535,7 @@ static void wm_init_userdef(Main *bmain) BKE_sound_init(bmain); - /* Update the temporary directory from the preferences or fallback to the system default. */ + /* Update the temporary directory from the preferences or fall back to the system default. */ BKE_tempdir_init(U.tempdir); /* Update input device preference. */ diff --git a/source/blender/windowmanager/intern/wm_operators.cc b/source/blender/windowmanager/intern/wm_operators.cc index 672b6340ce0..ad767a68c15 100644 --- a/source/blender/windowmanager/intern/wm_operators.cc +++ b/source/blender/windowmanager/intern/wm_operators.cc @@ -402,7 +402,7 @@ static const char *wm_context_member_from_ptr(bContext *C, const PointerRNA *ptr break; } if (is_id) { - /* Found a reference to this ID, so fallback to it if there is no direct reference. */ + /* Found a reference to this ID, so fall back to it if there is no direct reference. */ member_id = identifier; } } @@ -713,7 +713,7 @@ std::optional WM_prop_pystring_assign(bContext *C, std::nullopt; if (!lhs.has_value()) { - /* Fallback to `bpy.data.foo[id]` if we don't find in the context. */ + /* Fall back to `bpy.data.foo[id]` if we don't find in the context. */ if (std::optional lhs_str = RNA_path_full_property_py(ptr, prop, index)) { lhs = lhs_str; } diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.cc b/source/blender/windowmanager/xr/intern/wm_xr_session.cc index d8bbc3c025b..43cadf2659f 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_session.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr_session.cc @@ -222,7 +222,7 @@ wmWindow *wm_xr_session_root_window_or_fallback_get(const wmWindowManager *wm, /* Root window is still valid, use it. */ return runtime_data->session_root_win; } - /* Otherwise, fallback. */ + /* Otherwise, fall back. */ return static_cast(wm->windows.first); }