From b1959a96a2b54e9a425147f4ce3c3806c43c7188 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 18 Aug 2019 04:11:50 +1000 Subject: Cleanup: spelling --- source/blender/alembic/intern/abc_mesh.cc | 2 +- source/blender/blenlib/intern/freetypefont.c | 2 +- source/blender/blentranslation/msgfmt/msgfmt.c | 2 +- source/blender/bmesh/intern/bmesh_marking.c | 6 ++++-- source/blender/bmesh/intern/bmesh_query.c | 2 +- source/blender/bmesh/intern/bmesh_walkers_impl.c | 2 +- source/blender/compositor/intern/COM_CompositorContext.h | 2 +- source/blender/compositor/intern/COM_OpenCLDevice.h | 4 ++-- .../compositor/operations/COM_WriteBufferOperation.cpp | 2 +- source/blender/draw/engines/eevee/eevee_effects.c | 4 ++-- source/blender/draw/engines/eevee/eevee_lightprobes.c | 2 +- source/blender/draw/engines/eevee/eevee_lights.c | 2 +- source/blender/draw/intern/draw_cache_extract_mesh.c | 2 +- source/blender/draw/intern/draw_hair.c | 2 +- source/blender/draw/intern/draw_manager.c | 2 +- source/blender/draw/intern/draw_manager_shader.c | 2 +- source/blender/editors/animation/drivers.c | 2 +- source/blender/editors/animation/keyframing.c | 4 ++-- source/blender/editors/gpencil/annotate_paint.c | 2 +- source/blender/editors/interface/interface_handlers.c | 2 +- source/blender/editors/interface/interface_ops.c | 2 +- source/blender/editors/object/object_relations.c | 2 +- source/blender/editors/render/render_view.c | 4 ++-- source/blender/editors/space_image/space_image.c | 2 +- source/blender/editors/space_info/info_stats.c | 2 +- source/blender/editors/space_outliner/outliner_intern.h | 4 ++-- source/blender/editors/space_outliner/outliner_tools.c | 10 ++++++---- source/blender/editors/space_sequencer/sequencer_draw.c | 5 ++--- .../blender/freestyle/intern/scene_graph/FrsMaterial.h | 16 ++++++++-------- .../blender/freestyle/intern/scene_graph/NodeTransform.h | 6 +++--- source/blender/freestyle/intern/stroke/Curve.h | 2 +- source/blender/gpu/intern/gpu_texture.c | 2 +- source/blender/makesdna/DNA_documentation.h | 2 +- source/blender/physics/intern/BPH_mass_spring.cpp | 2 +- source/blender/python/intern/bpy_operator_wrap.c | 2 +- source/blender/python/mathutils/mathutils_geometry.c | 2 +- source/blender/render/extern/include/RE_pipeline.h | 2 +- source/blender/render/intern/source/imagetexture.c | 2 +- source/blender/windowmanager/intern/wm_operators.c | 2 +- source/blender/windowmanager/intern/wm_window.c | 2 +- 40 files changed, 63 insertions(+), 60 deletions(-) (limited to 'source') diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc index be2793e38f7..8728303923a 100644 --- a/source/blender/alembic/intern/abc_mesh.cc +++ b/source/blender/alembic/intern/abc_mesh.cc @@ -1336,7 +1336,7 @@ static void read_subd_sample(const std::string &iobject_full_name, if ((settings->read_flag & MOD_MESHSEQ_READ_POLY) != 0) { /* Alembic's 'SubD' scheme is used to store subdivision surfaces, i.e. the pre-subdivision - * mesh. Currently we don't add a subdivison modifier when we load such data. This code is + * mesh. Currently we don't add a subdivision modifier when we load such data. This code is * assuming that the subdivided surface should be smooth, and sets a flag that will eventually * mark all polygons as such. */ abc_mesh_data.poly_flag_smooth = true; diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index 7be7674069c..b5a950d6851 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -565,7 +565,7 @@ VChar *BLI_vfontchar_copy(const VChar *vchar_src, const int UNUSED(flag)) * between them * * - * Each glyph's original outline points are located on a grid of indivisible units. + * Each glyphs original outline points are located on a grid of indivisible units. * The points are stored in the font file as 16-bit integer grid coordinates, * with the grid origin's being at (0, 0); they thus range from -16384 to 16383. * diff --git a/source/blender/blentranslation/msgfmt/msgfmt.c b/source/blender/blentranslation/msgfmt/msgfmt.c index 215c92f87de..4691d791301 100644 --- a/source/blender/blentranslation/msgfmt/msgfmt.c +++ b/source/blender/blentranslation/msgfmt/msgfmt.c @@ -24,7 +24,7 @@ * * Generate binary message catalog from textual translation description. * - * This program converts a textual Uniforum-style message catalog (.po file) + * This program converts a textual Uniform-style message catalog (.po file) * into a binary GNU catalog (.mo file). * This is essentially the same function as the GNU msgfmt program, * however, it is a simpler implementation. diff --git a/source/blender/bmesh/intern/bmesh_marking.c b/source/blender/bmesh/intern/bmesh_marking.c index 5aec59ccd5d..788edc348d9 100644 --- a/source/blender/bmesh/intern/bmesh_marking.c +++ b/source/blender/bmesh/intern/bmesh_marking.c @@ -870,9 +870,11 @@ void BM_editselection_normal(BMEditSelection *ese, float r_normal[3]) } } -/* Calculate a plane that is rightangles to the edge/vert/faces normal +/** + * Calculate a plane that is right angles to the edge/vert/faces normal * also make the plane run along an axis that is related to the geometry, - * because this is used for the gizmos Y axis. */ + * because this is used for the gizmos Y axis. + */ void BM_editselection_plane(BMEditSelection *ese, float r_plane[3]) { if (ese->htype == BM_VERT) { diff --git a/source/blender/bmesh/intern/bmesh_query.c b/source/blender/bmesh/intern/bmesh_query.c index 4a47bcccb25..51bc86e40eb 100644 --- a/source/blender/bmesh/intern/bmesh_query.c +++ b/source/blender/bmesh/intern/bmesh_query.c @@ -1542,7 +1542,7 @@ float BM_loop_calc_face_normal_safe_ex(const BMLoop *l, const float epsilon_sq, /** * #BM_loop_calc_face_normal_safe_ex with pre-defined sane epsilon. * - * Since this doesn't scale baed on triangle size, fixed value works well. + * Since this doesn't scale based on triangle size, fixed value works well. */ float BM_loop_calc_face_normal_safe(const BMLoop *l, float r_normal[3]) { diff --git a/source/blender/bmesh/intern/bmesh_walkers_impl.c b/source/blender/bmesh/intern/bmesh_walkers_impl.c index ade6fdfcbed..f317c59b8d1 100644 --- a/source/blender/bmesh/intern/bmesh_walkers_impl.c +++ b/source/blender/bmesh/intern/bmesh_walkers_impl.c @@ -648,7 +648,7 @@ static void *bmw_ConnectedVertexWalker_step(BMWalker *walker) * \note that this doesn't work on non-manifold geometry. * it might be better to rewrite this to extract * boundary info from the island walker, rather then directly walking - * over the boundary. raises an error if it encounters nonmanifold geometry. + * over the boundary. raises an error if it encounters non-manifold geometry. * * \todo Add restriction flag/callback for wire edges. */ diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h index f4cd60e3ee0..b28d5ff0cdf 100644 --- a/source/blender/compositor/intern/COM_CompositorContext.h +++ b/source/blender/compositor/intern/COM_CompositorContext.h @@ -215,7 +215,7 @@ class CompositorContext { } /** - * \brief get the current framenumber of the scene in this context + * \brief get the current frame-number of the scene in this context */ int getFramenumber() const; diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.h b/source/blender/compositor/intern/COM_OpenCLDevice.h index 7a83bda162c..45ce77acac7 100644 --- a/source/blender/compositor/intern/COM_OpenCLDevice.h +++ b/source/blender/compositor/intern/COM_OpenCLDevice.h @@ -78,8 +78,8 @@ class OpenCLDevice : public Device { bool initialize(); /** - * \brief deinitialize the device - * During deintiialization the command queue is cleared + * \brief de-initialize the device + * During de-initialization the command queue is cleared */ void deinitialize(); diff --git a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp index beba29e6755..1df8bd6f4c7 100644 --- a/source/blender/compositor/operations/COM_WriteBufferOperation.cpp +++ b/source/blender/compositor/operations/COM_WriteBufferOperation.cpp @@ -119,7 +119,7 @@ void WriteBufferOperation::executeOpenCLRegion(OpenCLDevice *device, /* * 1. create cl_mem from outputbuffer * 2. call NodeOperation (input) executeOpenCLChunk(.....) - * 3. schedule readback from opencl to main device (outputbuffer) + * 3. schedule read back from opencl to main device (outputbuffer) * 4. schedule native callback * * note: list of cl_mem will be filled by 2, and needs to be cleaned up by 4 diff --git a/source/blender/draw/engines/eevee/eevee_effects.c b/source/blender/draw/engines/eevee/eevee_effects.c index 93521c71127..0ca1e0b2858 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.c +++ b/source/blender/draw/engines/eevee/eevee_effects.c @@ -509,7 +509,7 @@ void EEVEE_downsample_buffer(EEVEE_Data *vedata, GPUTexture *texture_src, int le } /** - * Simple downsampling algorithm for cubemap. Reconstruct mip chain up to mip level. + * Simple down-sampling algorithm for cubemap. Reconstruct mip chain up to mip level. */ void EEVEE_downsample_cube_buffer(EEVEE_Data *vedata, GPUTexture *texture_src, int level) { @@ -580,7 +580,7 @@ void EEVEE_draw_effects(EEVEE_ViewLayerData *UNUSED(sldata), EEVEE_Data *vedata) /* NOTE: Lookdev drawing happens before TAA but after * motion blur and dof to avoid distortions. * Velocity resolve use a hack to exclude lookdev - * spheres from creating shimering reprojection vectors. */ + * spheres from creating shimmering re-projection vectors. */ EEVEE_lookdev_draw(vedata); EEVEE_velocity_resolve(vedata); diff --git a/source/blender/draw/engines/eevee/eevee_lightprobes.c b/source/blender/draw/engines/eevee/eevee_lightprobes.c index 2026b44fe87..8b1309e8537 100644 --- a/source/blender/draw/engines/eevee/eevee_lightprobes.c +++ b/source/blender/draw/engines/eevee/eevee_lightprobes.c @@ -1213,7 +1213,7 @@ void EEVEE_lightbake_filter_visibility(EEVEE_ViewLayerData *sldata, DRW_draw_pass(psl->probe_visibility_compute); } -/* Actually a simple downsampling */ +/* Actually a simple down-sampling. */ static void downsample_planar(void *vedata, int level) { EEVEE_PassList *psl = ((EEVEE_Data *)vedata)->psl; diff --git a/source/blender/draw/engines/eevee/eevee_lights.c b/source/blender/draw/engines/eevee/eevee_lights.c index c15872b31fa..0bfc23b8354 100644 --- a/source/blender/draw/engines/eevee/eevee_lights.c +++ b/source/blender/draw/engines/eevee/eevee_lights.c @@ -779,7 +779,7 @@ static void eevee_light_setup(Object *ob, EEVEE_Light *evli) /** * Special ball distribution: - * Point are distributed in a way that when they are orthogonaly + * Point are distributed in a way that when they are orthogonally * projected into any plane, the resulting distribution is (close to) * a uniform disc distribution. */ diff --git a/source/blender/draw/intern/draw_cache_extract_mesh.c b/source/blender/draw/intern/draw_cache_extract_mesh.c index 098ce8642b8..5b56067d355 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh.c +++ b/source/blender/draw/intern/draw_cache_extract_mesh.c @@ -3790,7 +3790,7 @@ static void *extract_select_idx_init(const MeshRenderData *mr, void *buf) return vbo->data; } -/* TODO Use glVertexID to get loop index and use the data structure on the CPU to retreive the +/* TODO Use glVertexID to get loop index and use the data structure on the CPU to retrieve the * select element associated with this loop ID. This would remove the need for this separate index * VBOs. We could upload the p/e/v_origindex as a buffer texture and sample it inside the shader to * output original index. */ diff --git a/source/blender/draw/intern/draw_hair.c b/source/blender/draw/intern/draw_hair.c index fa1f1f2aab4..44ed01c47aa 100644 --- a/source/blender/draw/intern/draw_hair.c +++ b/source/blender/draw/intern/draw_hair.c @@ -253,7 +253,7 @@ void DRW_hair_update(void) * On some system it crashes (see T58489) and on some other it renders garbage (see T60171). * * So instead of using transform feedback we render to a texture, - * readback the result to system memory and reupload as VBO data. + * read back the result to system memory and re-upload as VBO data. * It is really not ideal performance wise, but it is the simplest * and the most local workaround that still uses the power of the GPU. */ diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 288f291561e..72fcb9ac968 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -1955,7 +1955,7 @@ void DRW_render_to_image(RenderEngine *engine, struct Depsgraph *depsgraph) DRW_opengl_context_enable(); } - /* IMPORTANT: We dont support immediate mode in render mode! + /* IMPORTANT: We don't support immediate mode in render mode! * This shall remain in effect until immediate mode supports * multiple threads. */ diff --git a/source/blender/draw/intern/draw_manager_shader.c b/source/blender/draw/intern/draw_manager_shader.c index d0aa6d55c03..9c34cdbac3b 100644 --- a/source/blender/draw/intern/draw_manager_shader.c +++ b/source/blender/draw/intern/draw_manager_shader.c @@ -178,7 +178,7 @@ static void drw_deferred_shader_compilation_free(void *custom_data) static void drw_deferred_shader_add(GPUMaterial *mat, bool deferred) { - /* Do not deferre the compilation if we are rendering for image. + /* Do not defer the compilation if we are rendering for image. * deferred rendering is only possible when `evil_C` is available */ if (DST.draw_ctx.evil_C == NULL || DRW_state_is_image_render() || !USE_DEFERRED_COMPILATION || !deferred) { diff --git a/source/blender/editors/animation/drivers.c b/source/blender/editors/animation/drivers.c index 935d11a388f..e341a16378c 100644 --- a/source/blender/editors/animation/drivers.c +++ b/source/blender/editors/animation/drivers.c @@ -218,7 +218,7 @@ static int add_driver_with_target(ReportList *UNUSED(reports), /* Create a driver variable for the target * - For transform properties, we want to automatically use "transform channel" instead - * (The only issue is with quat rotations vs euler channels...) + * (The only issue is with quaternion rotations vs euler channels...) * - To avoid problems with transform properties depending on the final transform that they * control (thus creating pseudo-cycles - see T48734), we don't use transform channels * when both the source and destinations are in same places. diff --git a/source/blender/editors/animation/keyframing.c b/source/blender/editors/animation/keyframing.c index dcc596e67e1..7fd2338dbf3 100644 --- a/source/blender/editors/animation/keyframing.c +++ b/source/blender/editors/animation/keyframing.c @@ -1544,9 +1544,9 @@ static bool delete_keyframe_fcurve(AnimData *adt, FCurve *fcu, float cfra) static void deg_tag_after_keyframe_delete(Main *bmain, ID *id, AnimData *adt) { if (adt->action == NULL) { - /* In the case last f-curve wes removed need to inform dependency graph + /* In the case last f-curve was removed need to inform dependency graph * about relations update, since it needs to get rid of animation operation - * for this datablock. */ + * for this data-block. */ DEG_id_tag_update_ex(bmain, id, ID_RECALC_ANIMATION_NO_FLUSH); DEG_relations_tag_update(bmain); } diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c index 464f9856b4b..22f1753a810 100644 --- a/source/blender/editors/gpencil/annotate_paint.c +++ b/source/blender/editors/gpencil/annotate_paint.c @@ -1156,7 +1156,7 @@ static tGPsdata *gp_session_initpaint(bContext *C) /* create new context data */ p = MEM_callocN(sizeof(tGPsdata), "Annotation Drawing Data"); - /* Try to initialise context data + /* Try to initialize context data * WARNING: This may not always succeed (e.g. using GP in an annotation-only context) */ if (gp_session_initdata(C, p) == 0) { diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 0cb0dbdc85c..19eb9699fc8 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -8184,7 +8184,7 @@ static int ui_handle_button_event(bContext *C, const wmEvent *event, uiBut *but) else { /* Do this so we can still mouse-up, closing the menu and running the button. * This is nice to support but there are times when the button gets left pressed. - * Keep disavled for now. */ + * Keep disabled for now. */ WM_event_remove_timer(data->wm, data->window, data->hold_action_timer); data->hold_action_timer = NULL; } diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c index 6051bf5ca40..fbd422a9752 100644 --- a/source/blender/editors/interface/interface_ops.c +++ b/source/blender/editors/interface/interface_ops.c @@ -1119,7 +1119,7 @@ static int reports_to_text_exec(bContext *C, wmOperator *UNUSED(op)) txt = BKE_text_add(bmain, "Recent Reports"); /* convert entire list to a display string, and add this to the text-block - * - if commandline debug option enabled, show debug reports too + * - if command-line debug option enabled, show debug reports too * - otherwise, up to info (which is what users normally see) */ str = BKE_reports_string(reports, (G.debug & G_DEBUG) ? RPT_DEBUG : RPT_INFO); diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index a69f4872e72..88ef0be3bc6 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -1744,7 +1744,7 @@ static Collection *single_object_users_collection(Main *bmain, } /* Since master collection has already be duplicated as part of scene copy, - * we do not duplictae it here. + * we do not duplicate it here. * However, this means its children need to be re-added manually here, * otherwise their parent lists are empty (which will lead to crashes, see T63101). */ CollectionChild *child_next, *child = collection->children.first; diff --git a/source/blender/editors/render/render_view.c b/source/blender/editors/render/render_view.c index cd5edcdc3f4..3154d5d0985 100644 --- a/source/blender/editors/render/render_view.c +++ b/source/blender/editors/render/render_view.c @@ -223,8 +223,8 @@ ScrArea *render_view_open(bContext *C, int mx, int my, ReportList *reports) /* get the correct image, and scale it */ sima->image = BKE_image_verify_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result"); - /* if we're rendering to full screen, set appropriate hints on image editor - * so it can restore properly on pressing esc */ + /* If we're rendering to full screen, set appropriate hints on image editor + * so it can restore properly on pressing escape. */ if (sa->full) { sima->flag |= SI_FULLWINDOW; diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 33e77d3623e..5fa4fe3e077 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -586,7 +586,7 @@ static void image_main_region_draw(const bContext *C, ARegion *ar) float col[3]; /* XXX This is in order to draw UI batches with the DRW - * olg context since we now use it for drawing the entire area */ + * old context since we now use it for drawing the entire area. */ gpu_batch_presets_reset(); GPUViewport *viewport = diff --git a/source/blender/editors/space_info/info_stats.c b/source/blender/editors/space_info/info_stats.c index 946274de882..106edc290d5 100644 --- a/source/blender/editors/space_info/info_stats.c +++ b/source/blender/editors/space_info/info_stats.c @@ -574,7 +574,7 @@ void ED_info_stats_clear(ViewLayer *view_layer) const char *ED_info_stats_string(Main *bmain, Scene *scene, ViewLayer *view_layer) { - /* Loopin through dependency graph when interface is locked in not safe. + /* Looping through dependency graph when interface is locked in not safe. * Thew interface is marked as locked when jobs wants to modify the * dependency graph. */ wmWindowManager *wm = bmain->wm.first; diff --git a/source/blender/editors/space_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h index e37f3519653..466e6684eca 100644 --- a/source/blender/editors/space_outliner/outliner_intern.h +++ b/source/blender/editors/space_outliner/outliner_intern.h @@ -139,8 +139,8 @@ enum { TE_DISABLED = (1 << 4), TE_DRAGGING = (1 << 5), TE_CHILD_NOT_IN_COLLECTION = (1 << 6), - /* Child elements of the same type in the iconrow are drawn merged as one icon. - * TE_ICONROW_MERGED is set for an element that is part of these merged child icons. */ + /* Child elements of the same type in the icon-row are drawn merged as one icon. + * This flag is set for an element that is part of these merged child icons. */ TE_ICONROW_MERGED = (1 << 7), }; diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index 582a9cad312..49f6189c17c 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -479,9 +479,11 @@ void OUTLINER_OT_scene_operation(wmOperatorType *ot) } /* ******************************************** */ -/* Stores the parent and a child element of a merged iconrow icon for - * the merged select popup menu. The subtree of the parent is searched and - * the child is needed to only show elements of the same type in the popup. */ +/** + * Stores the parent and a child element of a merged icon-row icon for + * the merged select popup menu. The sub-tree of the parent is searched and + * the child is needed to only show elements of the same type in the popup. + */ typedef struct MergedSearchData { TreeElement *parent_element; TreeElement *select_element; @@ -545,7 +547,7 @@ static void merged_element_search_call_cb(struct bContext *C, void *UNUSED(arg1) } /** Merged element search menu - * Created on activation of a merged or aggregated iconrow icon. + * Created on activation of a merged or aggregated icon-row icon. */ static uiBlock *merged_element_search_menu(bContext *C, ARegion *ar, void *data) { diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 07350b5269e..b15acb12d00 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -1045,9 +1045,8 @@ ImBuf *sequencer_ibuf_get(struct Main *bmain, bmain, depsgraph, scene, rectx, recty, proxy_size, false, &context); context.view_id = BKE_scene_multiview_view_id_get(&scene->r, viewname); - /* sequencer could start rendering, in this case we need to be sure it wouldn't be canceled - * by Esc pressed somewhere in the past - */ + /* Sequencer could start rendering, in this case we need to be sure it wouldn't be canceled + * by Escape pressed somewhere in the past. */ G.is_break = false; /* Rendering can change OGL context. Save & Restore framebuffer. */ diff --git a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h index c5a87c3baaf..80cd783f164 100644 --- a/source/blender/freestyle/intern/scene_graph/FrsMaterial.h +++ b/source/blender/freestyle/intern/scene_graph/FrsMaterial.h @@ -36,14 +36,14 @@ class FrsMaterial { /*! Default constructor */ inline FrsMaterial(); - /*! Builds a Material from its line, diffuse, ambiant, specular, emissive + /*! Builds a Material from its line, diffuse, ambient, specular, emissive * colors, a shininess coefficient and line color priority. * \param iLine: * A 4 element float-array containing the line color. * \param iDiffuse: * A 4 element float-array containing the diffuse color. * \param iAmbiant: - * A 4 element float-array containing the ambiant color. + * A 4 element float-array containing the ambient color. * \param iSpecular: * A 4 element float-array containing the specular color. * \param iEmission: @@ -159,31 +159,31 @@ class FrsMaterial { return Specular[3]; } - /*! Returns the ambiant color as a 4 float array */ + /*! Returns the ambient color as a 4 float array */ inline const float *ambient() const { return Ambient; } - /*! Returns the red component of the ambiant color */ + /*! Returns the red component of the ambient color */ inline const float ambientR() const { return Ambient[0]; } - /*! Returns the green component of the ambiant color */ + /*! Returns the green component of the ambient color */ inline const float ambientG() const { return Ambient[1]; } - /*! Returns the blue component of the ambiant color */ + /*! Returns the blue component of the ambient color */ inline const float ambientB() const { return Ambient[2]; } - /*! Returns the alpha component of the ambiant color */ + /*! Returns the alpha component of the ambient color */ inline const float ambientA() const { return Ambient[3]; @@ -267,7 +267,7 @@ class FrsMaterial { */ inline void setSpecular(const float r, const float g, const float b, const float a); - /*! Sets the ambiant color. + /*! Sets the ambient color. * \param r: * Red component * \param g: diff --git a/source/blender/freestyle/intern/scene_graph/NodeTransform.h b/source/blender/freestyle/intern/scene_graph/NodeTransform.h index ddae714f9d4..1118417657f 100644 --- a/source/blender/freestyle/intern/scene_graph/NodeTransform.h +++ b/source/blender/freestyle/intern/scene_graph/NodeTransform.h @@ -48,7 +48,7 @@ class NodeTransform : public NodeGroup { /*! multiplies the current matrix by the x, y, z translation matrix. */ void Translate(real x, real y, real z); - /*! multiplis the current matrix by a rotation matrix + /*! multiplies the current matrix by a rotation matrix * iAngle * The rotation angle * x, y, z @@ -56,13 +56,13 @@ class NodeTransform : public NodeGroup { */ void Rotate(real iAngle, real x, real y, real z); - /*! multiplys the current matrix by a scaling matrix. + /*! multiplies the current matrix by a scaling matrix. * x, y, z * The scaling coefficients with respect to the x,y,z axis */ void Scale(real x, real y, real z); - /*! Multiplys the current matrix by iMatrix */ + /*! Multiplies the current matrix by iMatrix */ void MultiplyMatrix(const Matrix44r &iMatrix); /*! Sets the current matrix to iMatrix */ diff --git a/source/blender/freestyle/intern/stroke/Curve.h b/source/blender/freestyle/intern/stroke/Curve.h index 7eadfa830ce..8a233eef4ab 100644 --- a/source/blender/freestyle/intern/stroke/Curve.h +++ b/source/blender/freestyle/intern/stroke/Curve.h @@ -56,7 +56,7 @@ using namespace Geometry; /*! Class to represent a point of a curve. * A CurvePoint can be any point of a 1D curve (it doesn't have to be a vertex of the curve). * Any Interface1D is built upon ViewEdges, themselves built upon FEdges. Therefore, a curve is - * basically a polyline made of a list SVertex. Thus, a CurvePoint is built by lineraly + * basically a polyline made of a list SVertex. Thus, a CurvePoint is built by linearly * interpolating two SVertex. CurvePoint can be used as virtual points while querying 0D * information along a curve at a given resolution. */ diff --git a/source/blender/gpu/intern/gpu_texture.c b/source/blender/gpu/intern/gpu_texture.c index dab17fcd72a..955b11036ef 100644 --- a/source/blender/gpu/intern/gpu_texture.c +++ b/source/blender/gpu/intern/gpu_texture.c @@ -1598,7 +1598,7 @@ void GPU_texture_generate_mipmap(GPUTexture *tex) if (GPU_texture_depth(tex)) { /* Some drivers have bugs when using glGenerateMipmap with depth textures (see T56789). - * In this case we just create a complete texture with mipmaps manually without downsampling. + * In this case we just create a complete texture with mipmaps manually without down-sampling. * You must initialize the texture levels using other methods like * GPU_framebuffer_recursive_downsample(). */ int levels = 1 + floor(log2(max_ii(tex->w, tex->h))); diff --git a/source/blender/makesdna/DNA_documentation.h b/source/blender/makesdna/DNA_documentation.h index be11b3d9040..0251625292c 100644 --- a/source/blender/makesdna/DNA_documentation.h +++ b/source/blender/makesdna/DNA_documentation.h @@ -27,7 +27,7 @@ * blender file. There is an executable that scans all files, looking * for struct-s to serialize (hence sdna: Struct \ref DNA). From this * information, it builds a file with numbers that encode the format, - * the names of variables, and the plce to look for them. + * the names of variables, and the place to look for them. * * \section dnaissues Known issues with DNA * diff --git a/source/blender/physics/intern/BPH_mass_spring.cpp b/source/blender/physics/intern/BPH_mass_spring.cpp index 95c16c2f033..07cb3370eec 100644 --- a/source/blender/physics/intern/BPH_mass_spring.cpp +++ b/source/blender/physics/intern/BPH_mass_spring.cpp @@ -393,7 +393,7 @@ BLI_INLINE void cloth_calc_spring_force(ClothModifierData *clmd, ClothSpring *s) if (s->type & CLOTH_SPRING_TYPE_SEWING) { /* TODO: verify, half verified (couldn't see error) * sewing springs usually have a large distance at first so clamp the force so we don't get - * tunnelling through collision objects. */ + * tunneling through collision objects. */ BPH_mass_spring_force_spring_linear(data, s->ij, s->kl, diff --git a/source/blender/python/intern/bpy_operator_wrap.c b/source/blender/python/intern/bpy_operator_wrap.c index 8f2f08c7c37..2e88a2a5b06 100644 --- a/source/blender/python/intern/bpy_operator_wrap.c +++ b/source/blender/python/intern/bpy_operator_wrap.c @@ -58,7 +58,7 @@ static void operator_properties_init(wmOperatorType *ot) /* set the default property: ot->prop */ { /* Picky developers will notice that 'bl_property' won't work with inheritance - * get direct from the dict to avoid raising a load of attribute errors (yes this isnt ideal) + * get direct from the dict to avoid raising a load of attribute errors (yes this isn't ideal) * - campbell. */ PyObject *py_class_dict = py_class->tp_dict; PyObject *bl_property = PyDict_GetItem(py_class_dict, bpy_intern_str_bl_property); diff --git a/source/blender/python/mathutils/mathutils_geometry.c b/source/blender/python/mathutils/mathutils_geometry.c index f7eed390ca2..13d36e5af91 100644 --- a/source/blender/python/mathutils/mathutils_geometry.c +++ b/source/blender/python/mathutils/mathutils_geometry.c @@ -1510,7 +1510,7 @@ static PyObject *M_Geometry_convex_hull_2d(PyObject *UNUSED(self), PyObject *poi /* Return a PyObject that is a list of lists, using the flattened list array * to fill values, with start_table and len_table giving the start index - * and length of the toplevel_len sublists + * and length of the toplevel_len sub-lists. */ static PyObject *list_of_lists_from_arrays(int *array, int *start_table, diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index 93b85b6b96a..01a9e1a538b 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -256,7 +256,7 @@ void RE_SetView(struct Render *re, float mat[4][4]); /* get current view and window transform */ void RE_GetViewPlane(struct Render *re, rctf *r_viewplane, rcti *r_disprect); -/* set the render threads based on the commandline and autothreads setting */ +/* set the render threads based on the command-line and autothreads setting */ void RE_init_threadcount(Render *re); bool RE_WriteRenderViewsImage(struct ReportList *reports, diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c index e9175d8d024..9672184cec8 100644 --- a/source/blender/render/intern/source/imagetexture.c +++ b/source/blender/render/intern/source/imagetexture.c @@ -267,7 +267,7 @@ int imagewrap(Tex *tex, if (texres->nor) { if (tex->imaflag & TEX_NORMALMAP) { - /* qdn: normal from color + /* Normal from color: * The invert of the red channel is to make * the normal map compliant with the outside world. * It needs to be done because in Blender diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 29ecf798b3c..75d262f48a0 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -3011,7 +3011,7 @@ static void WM_OT_redraw_timer(wmOperatorType *ot) /** \} */ /* -------------------------------------------------------------------- */ -/** \name Reporet Memory Statistics +/** \name Report Memory Statistics * * Use for testing/debugging. * \{ */ diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 19fa0e87e50..47491813f70 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -658,7 +658,7 @@ void wm_window_ghostwindows_ensure(wmWindowManager *wm) BLI_assert(G.background == false); - /* no commandline prefsize? then we set this. + /* No command-line prefsize? then we set this. * Note that these values will be used only * when there is no startup.blend yet. */ -- cgit v1.2.3