mirror of
https://github.com/blender/blender
synced 2026-09-29 04:37:17 +03:00
Cleanup: various spelling corrections in comments & strings
This commit is contained in:
parent
3cfdf547ae
commit
f2871ca16b
19 changed files with 29 additions and 29 deletions
|
|
@ -1036,8 +1036,8 @@ Can cause linking issues due to too large binary size."
|
|||
OFF
|
||||
)
|
||||
mark_as_advanced(WITH_COMPILER_ASAN_EXTERN)
|
||||
# Note: Using tbbmalloc allocator seems to be fully compatible with current sanitizers
|
||||
# (both clang/llvm and gcc ones).
|
||||
# Note: Using TBBMALLOC allocator seems to be fully compatible with current sanitizers
|
||||
# (both CLANG/LLVM and GCC ones).
|
||||
set_and_warn_incompatible(WITH_COMPILER_ASAN WITH_MEM_VALGRIND OFF)
|
||||
set_and_warn_incompatible(WITH_COMPILER_ASAN_EXTERN WITH_MEM_VALGRIND OFF)
|
||||
|
||||
|
|
|
|||
|
|
@ -832,7 +832,7 @@ void BlenderDisplayDriver::flush()
|
|||
void BlenderDisplayDriver::draw(const Params ¶ms)
|
||||
{
|
||||
if (b_rv3d_ && (b_rv3d_->rflag & (blender::RV3D_NAVIGATING | blender::RV3D_PAINTING))) {
|
||||
/* Before drawing, wait that an update to the texture has actually occured, to synchronize
|
||||
/* Before drawing, wait that an update to the texture has actually occurred, to synchronize
|
||||
* rendering of Cycles with Blender. Use a timeout to prevent user interface in the main thread
|
||||
* from becoming unresponsive when rendering is too heavy. */
|
||||
thread_scoped_lock lock(has_update_mutex_);
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ TReturn metalrt_local_hit(constant KernelParamsMetal &launch_params_metal,
|
|||
return result;
|
||||
}
|
||||
|
||||
/* Make a copty of the lcg_state in the private address space, allowing to use utility function
|
||||
/* Make a copy of the lcg_state in the private address space, allowing to use utility function
|
||||
* to find the hit index to write the intersection to. This function is used from both HW-RT
|
||||
* code-path and non-HW-RT, making it hard to deal with the address spaces in the function
|
||||
* signature. Hopefully, compiler is smart enough to eliminate this temporary copy. */
|
||||
|
|
|
|||
|
|
@ -206,7 +206,7 @@ ccl_device bool integrate_light_nee(KernelGlobals kg, IntegratorShadowState stat
|
|||
}
|
||||
|
||||
/* Evaluate light shader for next event estimation, after shade_surface and shade_volume and before
|
||||
* shadow ray intersection. Only when the light has non-constant emisison. */
|
||||
* shadow ray intersection. Only when the light has non-constant emission. */
|
||||
ccl_device void integrator_shade_light_nee(KernelGlobals kg,
|
||||
IntegratorShadowState state,
|
||||
ccl_global float *ccl_restrict /*render_buffer*/)
|
||||
|
|
|
|||
|
|
@ -2441,7 +2441,7 @@ ccl_device_forceinline void integrate_volume_direct_light(
|
|||
return;
|
||||
}
|
||||
}
|
||||
/* For non-constant light shader, probablistic termination happens in
|
||||
/* For non-constant light shader, probabilistic termination happens in
|
||||
* SHADE_LIGHT_NEE when the full contribution is known. */
|
||||
else if (bsdf_eval_is_zero(&phase_eval)) {
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ struct LightSample {
|
|||
/* Result of evaluating a light from an intersection. */
|
||||
struct LightEval {
|
||||
float eval_fac = 0.0f; /* Intensity multiplier (normalization, spot falloff) */
|
||||
float pdf = 0.0f; /* Pdf for light sampling with next event estimation sampling. */
|
||||
float pdf = 0.0f; /* PDF for light sampling with next event estimation sampling. */
|
||||
};
|
||||
|
||||
/* Utilities */
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ def mutex_lock_and_open(file_path: Path, mode: str) -> tuple[io.IOBase | None, C
|
|||
:param: mode MUST be a binary mode, to be compatible with the file locking
|
||||
on Windows. So either 'rb' or 'wb'.
|
||||
|
||||
:returns: If the file was opened & locked succesfully, a tuple (file,
|
||||
:returns: If the file was opened & locked successfully, a tuple (file,
|
||||
unlocker) is returned. Otherwise returns None. The caller should call
|
||||
`unlocker(file)` to unlock the mutex.
|
||||
"""
|
||||
|
|
@ -101,7 +101,7 @@ def mutex_lock_and_open(file_path: Path, mode: str) -> tuple[io.IOBase | None, C
|
|||
# It is not suitable here to use an 'exclusive create' ('x' option) here.
|
||||
# That will still create a race condition, with the space between creation
|
||||
# of the file and locking it. So, better to make the existence of the file
|
||||
# meaningless, and only communicate the lock state with an actual filesystem
|
||||
# meaningless, and only communicate the lock state with an actual file-system
|
||||
# lock.
|
||||
try:
|
||||
# Type is ignored here, because the type checker doesn't realize that
|
||||
|
|
|
|||
|
|
@ -1201,7 +1201,7 @@ class MetadataProviderFilesystem(MetadataProvider):
|
|||
dir = meta_path.parent
|
||||
dir.mkdir(mode=0o700, parents=True, exist_ok=True)
|
||||
|
||||
# See load() for an explanation of the numer of tries & wait time.
|
||||
# See load() for an explanation of the number of tries & wait time.
|
||||
meta_file, unlocker = locking.mutex_lock_and_open_with_retry(
|
||||
meta_path, 'wb', max_tries=20, wait_time_sec=0.1)
|
||||
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ static FT_Fixed to_16dot16(const double val)
|
|||
/**
|
||||
* from: http://www.freetype.org/freetype2/docs/glyphs/glyphs-6.html#section-1
|
||||
*
|
||||
* Vectorial representation of Freetype glyphs
|
||||
* Vectorial representation of FreeType glyphs
|
||||
*
|
||||
* The source format of outlines is a collection of closed paths called "contours". Each contour is
|
||||
* made of a series of line segments and bezier arcs. Depending on the file format, these can be
|
||||
|
|
|
|||
|
|
@ -662,7 +662,7 @@ static void scene_foreach_toolsettings(LibraryForeachIDData *data,
|
|||
&toolsett_old->imapaint.canvas,
|
||||
IDWALK_CB_USER);
|
||||
|
||||
/* These two Object pointers should just follow the normal Undo behaviour. See #153065. */
|
||||
/* These two Object pointers should just follow the normal Undo behavior. See #153065. */
|
||||
BKE_LIB_FOREACHID_UNDO_PRESERVE_PROCESS_IDSUPER_P(data,
|
||||
&toolsett->anim_mirror_object,
|
||||
do_undo_restore,
|
||||
|
|
|
|||
|
|
@ -1451,7 +1451,7 @@ template<typename T> void nonzero_winding_edge_split_test()
|
|||
}
|
||||
|
||||
/**
|
||||
* Stress test: self-intersecting polygon (figure-8 / bowtie shape).
|
||||
* Stress test: self-intersecting polygon (figure-8 / bow-tie shape).
|
||||
* Tests how winding is computed for a single face that crosses itself.
|
||||
*
|
||||
* \code{.unparsed}
|
||||
|
|
|
|||
|
|
@ -244,7 +244,7 @@ WorkSpace *ED_workspace_duplicate(WorkSpace *workspace_old, Main *bmain, wmWindo
|
|||
WorkSpace *workspace_new = id_cast<WorkSpace *>(BKE_id_copy(bmain, &workspace_old->id));
|
||||
|
||||
/* Try to keep active the layout from the new workspace matching the current active one from
|
||||
* the{ old workspace. */
|
||||
* the old workspace. */
|
||||
WorkSpaceLayout *layout_old = static_cast<WorkSpaceLayout *>(workspace_old->layouts.first);
|
||||
WorkSpaceLayout *layout_new = static_cast<WorkSpaceLayout *>(workspace_new->layouts.first);
|
||||
for (; layout_old && layout_new; layout_old = layout_old->next, layout_new = layout_new->next) {
|
||||
|
|
|
|||
|
|
@ -302,7 +302,7 @@ struct IntermediateFormWithIDs : IntermediateForm<AtomicLexer, NullParser> {
|
|||
using TokenID = ID<TokenTrait>;
|
||||
using LineID = ID<LineTrait>;
|
||||
using DirectiveID = ID<DirectiveTrait>;
|
||||
/* Typesafe Atom. */
|
||||
/* Type-safe Atom. */
|
||||
using AtomID = ID<AtomTrait, AtomicLexer::Atom>;
|
||||
|
||||
enum DirectiveType : char {
|
||||
|
|
@ -1059,7 +1059,7 @@ struct Preprocessor : IntermediateFormWithIDs {
|
|||
TokenType next_type = look_ahead(tok);
|
||||
/* Skip the token pasting operator. */
|
||||
if (curr_type == '#' && next_type == '#') {
|
||||
/* Token concat. */
|
||||
/* Token concatenate. */
|
||||
tok = next(next(tok));
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ struct LexerBase {
|
|||
|
||||
/** Token type per token. */
|
||||
MutableSpan<TokenType> token_types;
|
||||
/** End of the raw token before whitespace removing. */
|
||||
/** End of the raw token before white-space removing. */
|
||||
MutableSpan<uint32_t> token_ends;
|
||||
/** Ranges of characters per token. */
|
||||
OffsetIndices token_offsets;
|
||||
|
|
@ -67,7 +67,7 @@ struct SimpleLexer : LexerBase {
|
|||
};
|
||||
|
||||
/**
|
||||
* Allow recognition of common operators and numbers. Merge whitespaces.
|
||||
* Allow recognition of common operators and numbers. Merge white-spaces.
|
||||
*/
|
||||
struct ExpressionLexer : LexerBase {
|
||||
void lexical_analysis(std::string_view input)
|
||||
|
|
@ -81,7 +81,7 @@ struct ExpressionLexer : LexerBase {
|
|||
};
|
||||
|
||||
/**
|
||||
* Allow recognition of operators and numbers. Merge whitespaces.
|
||||
* Allow recognition of operators and numbers. Merge white-spaces.
|
||||
* However, doesn't merge angle bracket with other tokens in order to use them for template
|
||||
* expressions parsing.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -147,7 +147,7 @@ Texture *VKTexturePool::acquire_texture(int2 extent,
|
|||
const AllocationHandle &handle = pool_[i];
|
||||
|
||||
/* VkMemoryRequirements::alignment specifies alignment requirements of the offset within a
|
||||
* memory allocation; we compute the necssary size of the allocation such that there is a
|
||||
* memory allocation; we compute the necessary size of the allocation such that there is a
|
||||
* starting offset to the first aligned index. As different images can have different
|
||||
* alignments, this is done per VkImage */
|
||||
VkDeviceSize aligned_offset = align_offset(
|
||||
|
|
|
|||
|
|
@ -464,7 +464,7 @@ static void openexr_header_compression(Header *header, int compression, int qual
|
|||
break;
|
||||
#endif
|
||||
#if COMBINED_OPENEXR_VERSION >= 30400
|
||||
/* Always writing 32 scanlines for now, could add an option for 256 scanlines
|
||||
/* Always writing 32 scan-lines for now, could add an option for 256 scan-lines
|
||||
* for slightly smaller files if there is demand for it. */
|
||||
case R_IMF_EXR_CODEC_HTJ2K:
|
||||
header->compression() = HTJ2K32_COMPRESSION;
|
||||
|
|
|
|||
|
|
@ -1177,7 +1177,7 @@ static void rna_def_font(BlenderRNA * /*brna*/, StructRNA *srna)
|
|||
RNA_def_property_enum_items(prop, prop_overflow_items);
|
||||
RNA_def_property_enum_default(prop, CU_OVERFLOW_NONE);
|
||||
RNA_def_property_ui_text(
|
||||
prop, "Textbox Overflow", "Handle the text behavior when it does not fit in the text boxes");
|
||||
prop, "TextBox Overflow", "Handle the text behavior when it does not fit in the text boxes");
|
||||
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
|
||||
|
||||
/* number values */
|
||||
|
|
@ -1247,7 +1247,7 @@ static void rna_def_font(BlenderRNA * /*brna*/, StructRNA *srna)
|
|||
prop = RNA_def_property(srna, "text_boxes", PROP_COLLECTION, PROP_NONE);
|
||||
RNA_def_property_collection_sdna(prop, nullptr, "tb", "totbox");
|
||||
RNA_def_property_struct_type(prop, "TextBox");
|
||||
RNA_def_property_ui_text(prop, "Textboxes", "");
|
||||
RNA_def_property_ui_text(prop, "TextBoxes", "");
|
||||
|
||||
prop = RNA_def_property(srna, "active_textbox", PROP_INT, PROP_NONE);
|
||||
RNA_def_property_int_sdna(prop, nullptr, "actbox");
|
||||
|
|
@ -1366,28 +1366,28 @@ static void rna_def_textbox(BlenderRNA *brna)
|
|||
RNA_def_property_float_sdna(prop, nullptr, "x");
|
||||
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
|
||||
RNA_def_property_ui_range(prop, -50.0f, 50.0f, 10, 3);
|
||||
RNA_def_property_ui_text(prop, "Textbox X Offset", "");
|
||||
RNA_def_property_ui_text(prop, "TextBox X Offset", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
|
||||
|
||||
prop = RNA_def_property(srna, "y", PROP_FLOAT, PROP_DISTANCE);
|
||||
RNA_def_property_float_sdna(prop, nullptr, "y");
|
||||
RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);
|
||||
RNA_def_property_ui_range(prop, -50.0f, 50.0f, 10, 3);
|
||||
RNA_def_property_ui_text(prop, "Textbox Y Offset", "");
|
||||
RNA_def_property_ui_text(prop, "TextBox Y Offset", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
|
||||
|
||||
prop = RNA_def_property(srna, "width", PROP_FLOAT, PROP_DISTANCE);
|
||||
RNA_def_property_float_sdna(prop, nullptr, "w");
|
||||
RNA_def_property_range(prop, 0.0f, FLT_MAX);
|
||||
RNA_def_property_ui_range(prop, 0.0f, 50.0f, 10, 3);
|
||||
RNA_def_property_ui_text(prop, "Textbox Width", "");
|
||||
RNA_def_property_ui_text(prop, "TextBox Width", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
|
||||
|
||||
prop = RNA_def_property(srna, "height", PROP_FLOAT, PROP_DISTANCE);
|
||||
RNA_def_property_float_sdna(prop, nullptr, "h");
|
||||
RNA_def_property_range(prop, 0.0f, FLT_MAX);
|
||||
RNA_def_property_ui_range(prop, 0.0f, 50.0f, 10, 3);
|
||||
RNA_def_property_ui_text(prop, "Textbox Height", "");
|
||||
RNA_def_property_ui_text(prop, "TextBox Height", "");
|
||||
RNA_def_property_update(prop, 0, "rna_Curve_update_data");
|
||||
|
||||
RNA_def_struct_path_func(srna, "rna_TextBox_path");
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ endif()
|
|||
|
||||
if(WITH_IMAGE_OPENEXR)
|
||||
# NOTE: This is _only_ needed when linking blender before the install target runs.
|
||||
# Once openjph libraries have been copied into `TARGETDIR_LIB` then Blender will link.
|
||||
# Once `openjph` libraries have been copied into `TARGETDIR_LIB` then Blender will link.
|
||||
# Don't rely on this though as failing on a fresh build is no good and the library
|
||||
# files could get outdated too.
|
||||
if(DEFINED LIBDIR)
|
||||
|
|
|
|||
|
|
@ -2642,7 +2642,7 @@ static const char arg_handle_python_expr_run_doc[] =
|
|||
"\tRun the given expression as a Python script.\n"
|
||||
"\n"
|
||||
"\tThe expression may be a complete multi-line script;\n"
|
||||
"\tyou are limited only by the platforms maximum argument length.";
|
||||
"\tyou are limited only by the platform's maximum argument length.";
|
||||
static int arg_handle_python_expr_run(int argc, const char **argv, void *data)
|
||||
{
|
||||
bContext *C = static_cast<bContext *>(data);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue