Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2020-03-19 04:05:34 +0300
committerCampbell Barton <ideasman42@gmail.com>2020-03-19 04:09:07 +0300
commited4c47632fd6c43aa9284e9ae9bcb77a7ec2ec82 (patch)
treeeee61d8bf6e0803fdb194ff072e78ab1e546d443
parent5bf09bbcdf5f9c476cec1f56de21d5e100e5b369 (diff)
Cleanup: spelling
-rw-r--r--source/blender/blenkernel/BKE_multires.h2
-rw-r--r--source/blender/blenkernel/intern/multires_reshape.c2
-rw-r--r--source/blender/blenkernel/intern/object_deform.c2
-rw-r--r--source/blender/blenkernel/intern/seqcache.c2
-rw-r--r--source/blender/draw/engines/eevee/eevee_volumes.c2
-rw-r--r--source/blender/editors/space_sequencer/sequencer_draw.c2
-rw-r--r--source/blender/editors/undo/memfile_undo.c6
-rw-r--r--source/blender/freestyle/intern/view_map/ViewMapBuilder.h2
-rw-r--r--source/blender/makesrna/intern/rna_access_compare_override.c2
9 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h
index a7a5e7b8bd5..c805b5f53a6 100644
--- a/source/blender/blenkernel/BKE_multires.h
+++ b/source/blender/blenkernel/BKE_multires.h
@@ -96,7 +96,7 @@ struct Mesh *BKE_multires_create_mesh(struct Depsgraph *depsgraph,
struct Object *object,
struct MultiresModifierData *mmd);
-/* Get coordinates of a deformed base mesh which is an ionput to the given multires modifier.
+/* Get coordinates of a deformed base mesh which is an input to the given multires modifier.
* NOTE: The modifiers will be re-evaluated. */
float (*BKE_multires_create_deformed_base_mesh_vert_coords(struct Depsgraph *depsgraph,
struct Object *object,
diff --git a/source/blender/blenkernel/intern/multires_reshape.c b/source/blender/blenkernel/intern/multires_reshape.c
index 53e1af15192..8674f5d2dbf 100644
--- a/source/blender/blenkernel/intern/multires_reshape.c
+++ b/source/blender/blenkernel/intern/multires_reshape.c
@@ -235,7 +235,7 @@ void multiresModifier_base_apply(struct Depsgraph *depsgraph,
/* For modifying base mesh we only want to consider deformation caused by multires displacement
* and ignore all deformation which might be caused by deformation modifiers leading the multires
* one.
- * So refine the subdiv to the original mesh verticies positions, which will also need to make
+ * So refine the subdiv to the original mesh vertices positions, which will also need to make
* it so object space displacement is re-evaluated for them (as in, can not re-use any knowledge
* from the final coordinates in the object space ). */
multires_reshape_apply_base_refine_from_base(&reshape_context);
diff --git a/source/blender/blenkernel/intern/object_deform.c b/source/blender/blenkernel/intern/object_deform.c
index 573573f20ed..f0ed4265042 100644
--- a/source/blender/blenkernel/intern/object_deform.c
+++ b/source/blender/blenkernel/intern/object_deform.c
@@ -706,7 +706,7 @@ bool BKE_object_defgroup_check_lock_relative(const bool *lock_flags,
}
/**
- * Additional check for whether the lock relative mode is applicable in multipaint mode.
+ * Additional check for whether the lock relative mode is applicable in multi-paint mode.
*
* @return true if none of the selected groups are locked.
*/
diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c
index e6920c71e24..6b1538655d3 100644
--- a/source/blender/blenkernel/intern/seqcache.c
+++ b/source/blender/blenkernel/intern/seqcache.c
@@ -82,7 +82,7 @@
* Multiple(DCACHE_IMAGES_PER_FILE) images share the same file.
* Each of these files contains header DiskCacheHeader followed by image data.
* Zlib compression with user definable level can be used to compress image data(per image)
- * Images are written in oreder in which they are rendered.
+ * Images are written in order in which they are rendered.
* Overwriting of individual entry is not possible.
* Stored images are deleted by invalidation, or when size of all files exceeds maximum
* size specified in user preferences.
diff --git a/source/blender/draw/engines/eevee/eevee_volumes.c b/source/blender/draw/engines/eevee/eevee_volumes.c
index e0008558135..7c17b7098d2 100644
--- a/source/blender/draw/engines/eevee/eevee_volumes.c
+++ b/source/blender/draw/engines/eevee/eevee_volumes.c
@@ -466,7 +466,7 @@ static bool eevee_volume_object_grids_init(Object *ob, ListBase *gpu_grids, DRWS
grp, gpu_grid->sampler_name, (drw_grid) ? drw_grid->texture : e_data.dummy_density);
if (drw_grid && multiple_transforms) {
- /* Specify per-volume tranform matrix that is applied after the
+ /* Specify per-volume transform matrix that is applied after the
* transform from object to bounds. */
mul_m4_m4m4(drw_grid->bounds_to_texture, drw_grid->object_to_texture, bounds_to_object);
DRW_shgroup_uniform_mat4(grp, gpu_grid->transform_name, drw_grid->bounds_to_texture);
diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c
index 93abf7a15e7..b801d14f213 100644
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@ -1009,7 +1009,7 @@ static void draw_seq_strip(const bContext *C,
y2 = seq->machine + SEQ_STRIP_OFSTOP;
/* Position of the text,
- * make sure that the strip content is visible also when the strip heigh gets lower. */
+ * make sure that the strip content is visible also when the strip height gets lower. */
float text_margin_y = y2 - min_ff(0.40f, 20 * U.dpi_fac * pixely);
/* Show some content only when the strip is high enough. */
diff --git a/source/blender/editors/undo/memfile_undo.c b/source/blender/editors/undo/memfile_undo.c
index 1ac4c031c8e..f9235938eb7 100644
--- a/source/blender/editors/undo/memfile_undo.c
+++ b/source/blender/editors/undo/memfile_undo.c
@@ -156,15 +156,15 @@ static void memfile_undosys_step_decode(struct bContext *C,
* The only time we should have to force a complete redo is when current step is tagged as a
* redo barrier.
* If previous step was not a memfile one should not matter here, current data in old bmain
- * should still always be valid for unchanged datat-blocks. */
+ * should still always be valid for unchanged data-blocks. */
if (us_p->use_old_bmain_data == false) {
use_old_bmain_data = false;
}
}
else {
/* Undo case.
- * Here we do not care whether current step is an undo barrier, since we are comming from 'the
- * future' we can still re-use old data. However, if *next* undo step
+ * Here we do not care whether current step is an undo barrier, since we are coming from
+ * 'the future' we can still re-use old data. However, if *next* undo step
* (i.e. the one immediately in the future, the one we are coming from)
* is a barrier, then we have to force a complete undo.
* Note that non-memfile undo steps **should** not be an issue anymore, since we handle
diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
index eac5b348555..a5d967af331 100644
--- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
+++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
@@ -255,7 +255,7 @@ class ViewMapBuilder {
* fe is the border (in 2D) between 2 2D spaces.
* if fe is a silhouette, One of these 2D spaces is occupied by the shape to which fe
* belongs (on its left) and the other one is either occupied by another shape or empty or
- * occupied by the same shape. We use this ray csating operation to determine which shape lies on
+ * occupied by the same shape. We use this ray casting operation to determine which shape lies on
* fe's right. The result is the shape id stored in oShapeId
*/
int ComputeRayCastingVisibility(FEdge *fe,
diff --git a/source/blender/makesrna/intern/rna_access_compare_override.c b/source/blender/makesrna/intern/rna_access_compare_override.c
index 053a0765546..96f152f0868 100644
--- a/source/blender/makesrna/intern/rna_access_compare_override.c
+++ b/source/blender/makesrna/intern/rna_access_compare_override.c
@@ -57,7 +57,7 @@ bool RNA_property_overridable_get(PointerRNA *ptr, PropertyRNA *prop)
/* Special handling for insertions of constraints or modifiers... */
/* TODO Note We may want to add a more generic system to RNA
* (like a special property in struct of items)
- * if we get more overrideable collections,
+ * if we get more override-able collections,
* for now we can live with those special-cases handling I think. */
if (RNA_struct_is_a(ptr->type, &RNA_Constraint)) {
bConstraint *con = ptr->data;