From a1322d7c9546dc78204c0ba9980c1e3094149e7a Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 19 Mar 2020 20:33:23 +0100 Subject: [PATCH] Cleanup: fix typos in comments Contributed by luzpaz. Differential Revision: https://developer.blender.org/D7133 --- source/blender/blenkernel/intern/fluid.c | 2 +- source/blender/blenkernel/intern/mesh_evaluate.c | 2 +- source/blender/blenkernel/intern/modifier.c | 8 ++++---- source/blender/datatoc/CMakeLists.txt | 4 ++-- .../draw/engines/eevee/shaders/common_uniforms_lib.glsl | 2 +- source/blender/editors/armature/armature_edit.c | 2 +- source/blender/editors/gpencil/gpencil_intern.h | 2 +- source/blender/editors/object/object_relations.c | 2 +- .../editors/sculpt_paint/paint_vertex_color_utils.c | 4 ++-- source/blender/editors/sound/sound_ops.c | 2 +- source/blender/editors/space_buttons/buttons_ops.c | 2 +- source/blender/editors/space_image/image_ops.c | 2 +- source/blender/editors/space_info/textview.c | 2 +- .../blender/editors/space_view3d/view3d_camera_control.c | 2 +- source/blender/editors/space_view3d/view3d_edit.c | 2 +- source/blender/editors/space_view3d/view3d_fly.c | 2 +- source/blender/freestyle/intern/geometry/SweepLine.h | 2 +- source/blender/io/collada/BCAnimationCurve.cpp | 4 ++-- source/blender/makesdna/DNA_space_types.h | 2 +- source/blender/physics/intern/BPH_mass_spring.cpp | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-) diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c index 462447db7fa..89e0c7a4bf0 100644 --- a/source/blender/blenkernel/intern/fluid.c +++ b/source/blender/blenkernel/intern/fluid.c @@ -4259,7 +4259,7 @@ static void manta_smoke_calc_transparency(FluidDomainSettings *mds, ViewLayer *v // get starting cell (light pos) if (BLI_bvhtree_bb_raycast(bv, light, voxel_center, pos) > FLT_EPSILON) { - // we're ouside -> use point on side of domain + // we're outside -> use point on side of domain cell[0] = (int)floor(pos[0]); cell[1] = (int)floor(pos[1]); cell[2] = (int)floor(pos[2]); diff --git a/source/blender/blenkernel/intern/mesh_evaluate.c b/source/blender/blenkernel/intern/mesh_evaluate.c index ac5a68b7764..0b3650fd40a 100644 --- a/source/blender/blenkernel/intern/mesh_evaluate.c +++ b/source/blender/blenkernel/intern/mesh_evaluate.c @@ -1279,7 +1279,7 @@ static void split_loop_nor_fan_do(LoopSplitTaskDataCommon *common_data, LoopSpli copy_v3_v3(nor, lnor); } } - /* Extra bonus: since small-stack is local to this funcion, + /* Extra bonus: since small-stack is local to this function, * no more need to empty it at all cost! */ } } diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 43e246bb342..0a76b61cdb1 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -677,7 +677,7 @@ Object *modifiers_isDeformedByArmature(Object *ob) } } - if (amd) { /* if were still here then return the last armature */ + if (amd) { /* if we're still here then return the last armature */ return amd->object; } @@ -700,7 +700,7 @@ Object *modifiers_isDeformedByMeshDeform(Object *ob) } } - if (mdmd) { /* if were still here then return the last armature */ + if (mdmd) { /* if we're still here then return the last armature */ return mdmd->object; } @@ -726,7 +726,7 @@ Object *modifiers_isDeformedByLattice(Object *ob) } } - if (lmd) { /* if were still here then return the last lattice */ + if (lmd) { /* if we're still here then return the last lattice */ return lmd->object; } @@ -752,7 +752,7 @@ Object *modifiers_isDeformedByCurve(Object *ob) } } - if (cmd) { /* if were still here then return the last curve */ + if (cmd) { /* if we're still here then return the last curve */ return cmd->object; } diff --git a/source/blender/datatoc/CMakeLists.txt b/source/blender/datatoc/CMakeLists.txt index 734171afa07..b750edd044e 100644 --- a/source/blender/datatoc/CMakeLists.txt +++ b/source/blender/datatoc/CMakeLists.txt @@ -1,7 +1,7 @@ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public LicenseS +# modify it under the terms of the GNU General Public Licenses # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. # @@ -58,7 +58,7 @@ if(NOT WITH_HEADLESS) target_link_libraries(datatoc_icon ${PNG_LIBRARIES} ${ZLIB_LIBRARIES}) # PNG library uses pow() and floow(), so seems -lm is required for proper - # workign binary. + # working binary. if(UNIX AND NOT APPLE) target_link_libraries(datatoc_icon m) endif() diff --git a/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl b/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl index 7f255b0859d..759b4098b37 100644 --- a/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl +++ b/source/blender/draw/engines/eevee/shaders/common_uniforms_lib.glsl @@ -3,7 +3,7 @@ layout(std140) uniform common_block { mat4 pastViewProjectionMatrix; vec4 viewVecs[2]; - vec2 mipRatio[10]; /* To correct mip level texel mis-alignement */ + vec2 mipRatio[10]; /* To correct mip level texel misalignment */ /* Ambient Occlusion */ vec4 aoParameters[2]; /* Volumetric */ diff --git a/source/blender/editors/armature/armature_edit.c b/source/blender/editors/armature/armature_edit.c index c7fa63a0e48..4285c7779d7 100644 --- a/source/blender/editors/armature/armature_edit.c +++ b/source/blender/editors/armature/armature_edit.c @@ -343,7 +343,7 @@ static int armature_calc_roll_exec(bContext *C, wmOperator *op) sub_v3_v3v3(dir_a, ebone->tail, ebone->head); normalize_v3(dir_a); - /* find the first bone in the chane with a different direction */ + /* find the first bone in the chain with a different direction */ do { sub_v3_v3v3(dir_b, ebone_other->head, ebone_other->tail); normalize_v3(dir_b); diff --git a/source/blender/editors/gpencil/gpencil_intern.h b/source/blender/editors/gpencil/gpencil_intern.h index f934a5c74f3..79f672274a7 100644 --- a/source/blender/editors/gpencil/gpencil_intern.h +++ b/source/blender/editors/gpencil/gpencil_intern.h @@ -562,7 +562,7 @@ void GPENCIL_OT_convert_old_files(struct wmOperatorType *ot); void GPENCIL_OT_generate_weights(struct wmOperatorType *ot); /* ****************************************************** */ -/* FILTERED ACTION DATA - TYPES ---> XXX DEPRECEATED OLD ANIM SYSTEM CODE! */ +/* FILTERED ACTION DATA - TYPES ---> XXX DEPRECATED OLD ANIM SYSTEM CODE! */ /* XXX - TODO: replace this with the modern bAnimListElem... */ /* This struct defines a structure used for quick access */ diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index f86ad1216cb..234cc119d6f 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2482,7 +2482,7 @@ static int make_override_library_exec(bContext *C, wmOperator *op) /* Disabled for now, according to some artist this is probably not really useful anyway. * And it breaks things like objects parented to bones * (most likely due to missing proper setting of inverse parent matrix?)... */ - /* Note: we might even actually want to get rid of that instanciating empty... */ + /* Note: we might even actually want to get rid of that instantiating empty... */ if (0 && new_ob->parent == NULL) { new_ob->parent = obcollection; } diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c b/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c index 71865d0de73..c26db3e265b 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c +++ b/source/blender/editors/sculpt_paint/paint_vertex_color_utils.c @@ -230,7 +230,7 @@ BLI_INLINE uint mcol_lighten(uint col_src, uint col_dst, int fac) cp_dst = (uchar *)&col_dst; cp_mix = (uchar *)&col_mix; - /* See if are lighter, if so mix, else don't do anything. + /* See if we're lighter, if so mix, else don't do anything. * if the paint color is darker then the original, then ignore */ if (IMB_colormanagement_get_luminance_byte(cp_src) > IMB_colormanagement_get_luminance_byte(cp_dst)) { @@ -264,7 +264,7 @@ BLI_INLINE uint mcol_darken(uint col_src, uint col_dst, int fac) cp_dst = (uchar *)&col_dst; cp_mix = (uchar *)&col_mix; - /* See if were darker, if so mix, else don't do anything. + /* See if we're darker, if so mix, else don't do anything. * if the paint color is brighter then the original, then ignore */ if (IMB_colormanagement_get_luminance_byte(cp_src) < IMB_colormanagement_get_luminance_byte(cp_dst)) { diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 61abbd10e98..e6e36309fec 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -800,7 +800,7 @@ static int sound_unpack_exec(bContext *C, wmOperator *op) int method = RNA_enum_get(op->ptr, "method"); bSound *sound = NULL; - /* find the suppplied image by name */ + /* find the supplied image by name */ if (RNA_struct_property_is_set(op->ptr, "id")) { char sndname[MAX_ID_NAME - 2]; RNA_string_get(op->ptr, "id", sndname); diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c index b393311e1fd..e2affa7bc36 100644 --- a/source/blender/editors/space_buttons/buttons_ops.c +++ b/source/blender/editors/space_buttons/buttons_ops.c @@ -227,7 +227,7 @@ static int file_browse_invoke(bContext *C, wmOperator *op, const wmEvent *event) is_relative = false; } - /* annoying exception!, if were dealing with the user prefs, default relative to be off */ + /* annoying exception!, if we're dealing with the user prefs, default relative to be off */ RNA_property_boolean_set(op->ptr, prop_relpath, is_relative); } } diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 0f823933c24..672f32f3c9c 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -2998,7 +2998,7 @@ static int image_unpack_exec(bContext *C, wmOperator *op) Image *ima = image_from_context(C); int method = RNA_enum_get(op->ptr, "method"); - /* find the suppplied image by name */ + /* find the supplied image by name */ if (RNA_struct_property_is_set(op->ptr, "id")) { char imaname[MAX_ID_NAME - 2]; RNA_string_get(op->ptr, "id", imaname); diff --git a/source/blender/editors/space_info/textview.c b/source/blender/editors/space_info/textview.c index d9af8555f04..19ada4779a0 100644 --- a/source/blender/editors/space_info/textview.c +++ b/source/blender/editors/space_info/textview.c @@ -285,7 +285,7 @@ static bool textview_draw_string(TextViewDrawState *tds, tds->xy[1] += tds->lheight; - /* Check if were out of view bounds. */ + /* Check if we're out of view bounds. */ if (tds->xy[1] > tds->scroll_ymax) { MEM_freeN(offsets); return false; diff --git a/source/blender/editors/space_view3d/view3d_camera_control.c b/source/blender/editors/space_view3d/view3d_camera_control.c index a6c1d1bbc33..daa3f641404 100644 --- a/source/blender/editors/space_view3d/view3d_camera_control.c +++ b/source/blender/editors/space_view3d/view3d_camera_control.c @@ -89,7 +89,7 @@ typedef struct View3DCameraControl { /* backup the views quat in case the user cancels flying in non camera mode. */ float rot_backup[4]; - /* remember if were ortho or not, only used for restoring the view if it was a ortho view */ + /* remember if we're ortho or not, only used for restoring the view if it was a ortho view */ char persp_backup; /* are we flying an ortho camera in perspective view, diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 2aff5482b1c..67dacca85ba 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -236,7 +236,7 @@ typedef struct ViewOpsData { } ViewOpsData; /** - * Size of the sphere being dragged for trackball rotation withing the view bounds. + * Size of the sphere being dragged for trackball rotation within the view bounds. * also affects speed (smaller is faster). */ #define TRACKBALLSIZE (1.1f) diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c index 8291d93ee13..563e1afa67e 100644 --- a/source/blender/editors/space_view3d/view3d_fly.c +++ b/source/blender/editors/space_view3d/view3d_fly.c @@ -593,7 +593,7 @@ static void flyEvent(FlyInfo *fly, const wmEvent *event) } else { /* flip speed rather than stopping, game like motion, - * else increase like mousewheel if were already moving in that direction */ + * else increase like mousewheel if we're already moving in that direction */ if (fly->speed < 0.0f) { fly->speed = -fly->speed; } diff --git a/source/blender/freestyle/intern/geometry/SweepLine.h b/source/blender/freestyle/intern/geometry/SweepLine.h index f31b276d358..b3555a4a160 100644 --- a/source/blender/freestyle/intern/geometry/SweepLine.h +++ b/source/blender/freestyle/intern/geometry/SweepLine.h @@ -31,7 +31,7 @@ namespace Freestyle { -/*! Class to define the intersection berween two segments*/ +/*! Class to define the intersection between two segments*/ template class Intersection { public: template Intersection(EdgeClass *eA, real ta, EdgeClass *eB, real tb) diff --git a/source/blender/io/collada/BCAnimationCurve.cpp b/source/blender/io/collada/BCAnimationCurve.cpp index 36800d611d2..98eb12f738e 100644 --- a/source/blender/io/collada/BCAnimationCurve.cpp +++ b/source/blender/io/collada/BCAnimationCurve.cpp @@ -230,7 +230,7 @@ const int BCAnimationCurve::closest_index_above(const float sample_frame, const return -1; } - const int cframe = fcurve->bezt[start_at].vec[1][0]; // inacurate! + const int cframe = fcurve->bezt[start_at].vec[1][0]; // inaccurate! if (fabs(cframe - sample_frame) < 0.00001) { return start_at; @@ -252,7 +252,7 @@ const int BCAnimationCurve::closest_index_below(const float sample_frame) const for (int fcu_index = 0; fcu_index < fcurve->totvert; fcu_index++) { upper_index = fcu_index; - const int cframe = fcurve->bezt[fcu_index].vec[1][0]; // inacurate! + const int cframe = fcurve->bezt[fcu_index].vec[1][0]; // inaccurate! if (cframe <= sample_frame) { lower_frame = cframe; lower_index = fcu_index; diff --git a/source/blender/makesdna/DNA_space_types.h b/source/blender/makesdna/DNA_space_types.h index 9d05e244c9d..d3cce8d1510 100644 --- a/source/blender/makesdna/DNA_space_types.h +++ b/source/blender/makesdna/DNA_space_types.h @@ -436,7 +436,7 @@ typedef struct SpaceGraph { /* SpaceGraph.flag (Graph Editor Settings) */ typedef enum eGraphEdit_Flag { - /* OLD DEPRECEATED SETTING */ + /* OLD DEPRECATED SETTING */ /* SIPO_LOCK_VIEW = (1 << 0), */ /* don't merge keyframes on the same frame after a transform */ diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp index 20dc4d5c5a8..76f0f8c8b55 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -570,7 +570,7 @@ static void cloth_calc_force( float f; float vol = cloth_calc_volume(clmd); - /* Calculate an artifical maximum value for cloth pressure. */ + /* Calculate an artificial maximum value for cloth pressure. */ f = fabs(clmd->sim_parms->uniform_pressure_force) + 200.0f; /* Clamp the cloth pressure to the calculated maximum value. */