Commit: 14897fb6533a6fcfdb665a215b8daf72b6550574 Author: Campbell Barton Date: Mon Apr 29 14:14:14 2019 +1000 Branches: master https://developer.blender.org/rB14897fb6533a6fcfdb665a215b8daf72b6550574
Cleanup: spelling =================================================================== M intern/cycles/blender/blender_curves.cpp M intern/cycles/blender/blender_sync.cpp M source/blender/blenkernel/intern/paint.c M source/blender/editors/animation/keyframes_draw.c M source/blender/editors/gpencil/gpencil_brush.c M source/blender/editors/gpencil/gpencil_edit.c M source/blender/editors/gpencil/gpencil_select.c M source/blender/editors/include/BIF_glutil.h M source/blender/editors/include/ED_screen_types.h M source/blender/editors/include/UI_resources.h M source/blender/editors/object/object_collection.c M source/blender/editors/sculpt_paint/paint_cursor.c M source/blender/editors/sculpt_paint/paint_ops.c M source/blender/editors/sculpt_paint/paint_utils.c M source/blender/editors/space_file/file_ops.c M source/blender/editors/space_view3d/view3d_draw_legacy.c M source/blender/gpu/intern/gpu_select_pick.c M source/blender/gpu/intern/gpu_uniformbuffer.c M source/blender/makesdna/DNA_brush_types.h M source/blender/makesdna/DNA_gpencil_types.h =================================================================== diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index 636b8e42481..1a36376f36e 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -766,7 +766,7 @@ static void ExportCurveSegmentsMotion(Mesh *mesh, ParticleCurveData *CData, int } } else { - /* Number of keys has changed. Genereate an interpolated version + /* Number of keys has changed. Generate an interpolated version * to preserve motion blur. */ const float step_size = num_center_curve_keys > 1 ? 1.0f / (num_center_curve_keys - 1) : 0.0f; diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp index 0ab6d88487e..8d93d517d4e 100644 --- a/intern/cycles/blender/blender_sync.cpp +++ b/intern/cycles/blender/blender_sync.cpp @@ -583,7 +583,7 @@ vector<Pass> BlenderSync::sync_render_passes(BL::RenderLayer &b_rlay, BL::ViewLa } /* Cryptomatte stores two ID/weight pairs per RGBA layer. - * User facing paramter is the number of pairs. */ + * User facing parameter is the number of pairs. */ int crypto_depth = min(16, get_int(crp, "pass_crypto_depth")) / 2; scene->film->cryptomatte_depth = crypto_depth; scene->film->cryptomatte_passes = CRYPT_NONE; diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index 7a36ff4e380..c52f8277b6b 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -506,7 +506,7 @@ void BKE_paint_curve_clamp_endpoint_add_index(PaintCurve *pc, const int add_inde pc->add_index = (add_index || pc->tot_points == 1) ? (add_index + 1) : 0; } -/* remove colour from palette. Must be certain color is inside the palette! */ +/** Remove color from palette. Must be certain color is inside the palette! */ void BKE_palette_color_remove(Palette *palette, PaletteColor *color) { if (BLI_listbase_count_at_most(&palette->colors, palette->active_color) == diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c index 22350f997f3..678afef5773 100644 --- a/source/blender/editors/animation/keyframes_draw.c +++ b/source/blender/editors/animation/keyframes_draw.c @@ -715,7 +715,7 @@ static void draw_keylist(View2D *v2d, float sel_mhcol[4], unsel_mhcol[4]; float ipo_color[4], ipo_color_mix[4]; - /* cache colours first */ + /* cache colors first */ UI_GetThemeColor4fv(TH_STRIP_SELECT, sel_color); UI_GetThemeColor4fv(TH_STRIP, unsel_color); UI_GetThemeColor4fv(TH_DOPESHEET_IPOLINE, ipo_color); diff --git a/source/blender/editors/gpencil/gpencil_brush.c b/source/blender/editors/gpencil/gpencil_brush.c index f9a5ff3a0cf..bc98cb5226b 100644 --- a/source/blender/editors/gpencil/gpencil_brush.c +++ b/source/blender/editors/gpencil/gpencil_brush.c @@ -969,7 +969,7 @@ typedef struct tGPSB_CloneBrushData { /* for "stamp" mode, the currently pasted brushes */ bGPDstroke **new_strokes; - /* mapping from colors referenced per stroke, to the new colours in the "pasted" strokes */ + /** Mapping from colors referenced per stroke, to the new colors in the "pasted" strokes. */ GHash *new_colors; } tGPSB_CloneBrushData; @@ -1017,7 +1017,7 @@ static void gp_brush_clone_init(bContext *C, tGP_BrushEditData *gso) } /* Init colormap for mapping between the pasted stroke's source color (names) - * and the final colours that will be used here instead. + * and the final colors that will be used here instead. */ data->new_colors = gp_copybuf_validate_colormap(C); } diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 5ac8cc1761f..008ed85d52a 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -1069,7 +1069,8 @@ void ED_gpencil_strokes_copybuf_free(void) gp_strokes_copypastebuf.first = gp_strokes_copypastebuf.last = NULL; } -/* Ensure that destination datablock has all the colours the pasted strokes need +/** + * Ensure that destination datablock has all the colors the pasted strokes need. * Helper function for copy-pasting strokes */ GHash *gp_copybuf_validate_colormap(bContext *C) diff --git a/source/blender/editors/gpencil/gpencil_select.c b/source/blender/editors/gpencil/gpencil_select.c index 365fb319b3b..b8540357cf8 100644 --- a/source/blender/editors/gpencil/gpencil_select.c +++ b/source/blender/editors/gpencil/gpencil_select.c @@ -294,7 +294,7 @@ typedef enum eGP_SelectGrouped { /* TODO: All with same prefix - * Useful for isolating all layers for a particular character for instance. */ - /* TODO: All with same appearance - colour/opacity/volumetric/fills ? */ + /* TODO: All with same appearance - color/opacity/volumetric/fills ? */ } eGP_SelectGrouped; /* ----------------------------------- */ diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.h index c88277c2ea5..7d4b6dbeea2 100644 --- a/source/blender/editors/include/BIF_glutil.h +++ b/source/blender/editors/include/BIF_glutil.h @@ -121,8 +121,8 @@ void immDrawPixelsTexScaled_clipping(IMMDrawPixelsTexState *state, /* Image buffer drawing functions, with display transform * - * The view and display settings can either be specified manually, or retrived - * from the context with the _ctx variations. + * The view and display settings can either be specified manually, + * or retrieved from the context with the '_ctx' variations. * * For better performance clipping coordinates can be specified so parts of the * image outside the view are skipped. */ diff --git a/source/blender/editors/include/ED_screen_types.h b/source/blender/editors/include/ED_screen_types.h index a584ce4cca0..c515d501a8d 100644 --- a/source/blender/editors/include/ED_screen_types.h +++ b/source/blender/editors/include/ED_screen_types.h @@ -120,7 +120,7 @@ enum { /** * Use for region show/hide state: * - When a region is collapsed, draw a handle to expose. - * - When a region is expanded, use the the action zone to resize the region. + * - When a region is expanded, use the action zone to resize the region. */ AZONE_REGION, /** @@ -128,8 +128,8 @@ enum { */ AZONE_FULLSCREEN, /** - * Hotspot azone around scrollbars to show/hide them. - * Only show the scrull-bars when the cursor is close. + * Hotspot azone around scroll-bars to show/hide them. + * Only show the scroll-bars when the cursor is close. */ AZONE_REGION_SCROLL, }; diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.h index 18962f9d9da..d82adaa6450 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.h @@ -356,7 +356,7 @@ void UI_GetThemeColorType4fv(int colorid, int spacetype, float col[4]); void UI_GetThemeColorShade4fv(int colorid, int offset, float col[4]); void UI_GetThemeColorShadeAlpha4fv(int colorid, int coloffset, int alphaoffset, float col[4]); -// get four colour values ranged between 0 and 255; includes the alpha channel +// get four color values ranged between 0 and 255; includes the alpha channel void UI_GetThemeColorShadeAlpha4ubv(int colorid, int coloffset, int alphaoffset, diff --git a/source/blender/editors/object/object_collection.c b/source/blender/editors/object/object_collection.c index 54c50db99a5..fcaefaf220d 100644 --- a/source/blender/editors/object/object_collection.c +++ b/source/blender/editors/object/object_collection.c @@ -481,7 +481,7 @@ static int collection_link_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } - /* Adding object to collection which is used as duplicollection for self is bad idea. + /* Adding object to collection which is used as dupli-collection for self is bad idea. * * It is also bad idea to add object to collection which is in collection which * contains our current object. diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index 697622aae96..65e24cecf82 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -833,7 +833,7 @@ static void paint_draw_alpha_overlay(UnifiedPaintSettings *ups, x -= vc->ar->winrct.xmin; y -= vc->ar->winrct.ymin; - /* coloured overlay should be drawn separately */ + /* Colored overlay should be drawn separately. */ if (col) { if (!(flags & PAINT_OVERLAY_OVERRIDE_PRIMARY)) { paint_draw_tex_overlay(ups, brush, vc, x, y, zoom, true, true); diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index e15912efdd4..a85a256c15f 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -583,7 +583,8 @@ typedef struct { float area_size[2]; StencilControlMode mode; StencilConstraint constrain_mode; - int mask; /* we are twaking mask or colour stencil */ + /** We are tweaking mask or color stencil. */ + int mask; Brush *br; float *dim_target; float *rot_target; diff --git a/source/blender/editors/sculpt_paint/paint_utils.c b/source/blender/editors/sculpt_paint/paint_utils.c index 91a2ebd0603..6d003820723 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.c +++ b/source/blender/editors/sculpt_paint/paint_utils.c @@ -483,7 +483,7 @@ void paint_sample_color( } if (CTX_wm_view3d(C) && texpaint_proj) { - /* first try getting a colour directly from the mesh faces if possible */ + /* first try getting a color directly from the mesh faces if possible */ ViewLayer *view_layer = CTX_data_view_layer(C); Object *ob = OBACT(view_layer); Object *ob_eval = DEG_get_evaluated_object(depsgraph, ob); diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops. @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs