From 36d6aa428f4848cfb153b34bdc4921ee9cabb227 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 1 Jul 2020 13:12:24 +1000 Subject: Cleanup: spelling --- .../blender/editors/armature/armature_relations.c | 24 +++++++++++----------- source/blender/editors/gpencil/annotate_paint.c | 4 +++- source/blender/editors/gpencil/gpencil_data.c | 4 ++-- source/blender/editors/gpencil/gpencil_paint.c | 4 +++- source/blender/editors/include/ED_screen_types.h | 2 +- .../editors/interface/interface_templates.c | 2 +- source/blender/editors/mesh/editmesh_knife.c | 10 +++++---- .../blender/editors/screen/workspace_layout_edit.c | 2 +- .../editors/sculpt_paint/paint_image_proj.c | 4 ++-- source/blender/editors/sculpt_paint/paint_vertex.c | 6 +++--- .../editors/space_view3d/view3d_camera_control.c | 2 +- source/blender/editors/space_view3d/view3d_edit.c | 2 +- .../blender/editors/space_view3d/view3d_project.c | 6 +++--- .../blender/editors/transform/transform_convert.c | 2 +- .../editors/transform/transform_convert_mask.c | 2 +- .../editors/transform/transform_convert_mesh.c | 8 ++++---- source/blender/editors/transform/transform_data.h | 4 ++-- 17 files changed, 47 insertions(+), 41 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/armature/armature_relations.c b/source/blender/editors/armature/armature_relations.c index 8dfb8177ddb..f90d781baca 100644 --- a/source/blender/editors/armature/armature_relations.c +++ b/source/blender/editors/armature/armature_relations.c @@ -304,10 +304,10 @@ int ED_armature_join_objects_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - /* Get editbones of active armature to add editbones to */ + /* Get edit-bones of active armature to add edit-bones to */ ED_armature_to_edit(arm); - /* get pose of active object and move it out of posemode */ + /* Get pose of active object and move it out of pose-mode */ pose = ob_active->pose; ob_active->mode &= ~OB_MODE_POSE; @@ -325,7 +325,7 @@ int ED_armature_join_objects_exec(bContext *C, wmOperator *op) afd.tarArm = ob_active; afd.names_map = BLI_ghash_str_new("join_armature_adt_fix"); - /* Make a list of editbones in current armature */ + /* Make a list of edit-bones in current armature */ ED_armature_to_edit(ob_iter->data); /* Get Pose of current armature */ @@ -549,7 +549,7 @@ static void separated_armature_fix_links(Main *bmain, Object *origArm, Object *n /* Helper function for armature separating - remove certain bones from the given armature * sel: remove selected bones from the armature, otherwise the unselected bones are removed - * (ob is not in editmode) + * (ob is not in edit-mode) */ static void separate_armature_bones(Main *bmain, Object *ob, const bool is_select) { @@ -557,7 +557,7 @@ static void separate_armature_bones(Main *bmain, Object *ob, const bool is_selec bPoseChannel *pchan, *pchann; EditBone *curbone; - /* make local set of editbones to manipulate here */ + /* make local set of edit-bones to manipulate here */ ED_armature_to_edit(arm); /* go through pose-channels, checking if a bone should be removed */ @@ -591,7 +591,7 @@ static void separate_armature_bones(Main *bmain, Object *ob, const bool is_selec } } - /* free any of the extra-data this pchan might have */ + /* Free any of the extra-data this pchan might have. */ BKE_pose_channel_free(pchan); BKE_pose_channels_hash_free(ob->pose); @@ -601,7 +601,7 @@ static void separate_armature_bones(Main *bmain, Object *ob, const bool is_selec } } - /* exit editmode (recalculates pchans too) */ + /* Exit edit-mode (recalculates pose-channels too). */ ED_armature_edit_deselect_all(ob); ED_armature_from_edit(bmain, ob->data); ED_armature_edit_free(ob->data); @@ -652,15 +652,15 @@ static int separate_armature_exec(bContext *C, wmOperator *op) } /* We are going to do this as follows (unlike every other instance of separate): - * 1. Exit editmode +posemode for active armature/base. Take note of what this is. + * 1. Exit edit-mode & pose-mode for active armature/base. Take note of what this is. * 2. Duplicate base - BASACT is the new one now * 3. For each of the two armatures, - * enter editmode -> remove appropriate bones -> exit editmode + recalc. + * enter edit-mode -> remove appropriate bones -> exit edit-mode + recalculate. * 4. Fix constraint links - * 5. Make original armature active and enter editmode + * 5. Make original armature active and enter edit-mode */ - /* 1) store starting settings and exit editmode */ + /* 1) store starting settings and exit edit-mode */ ob_old->mode &= ~OB_MODE_POSE; ED_armature_from_edit(bmain, ob_old->data); @@ -700,7 +700,7 @@ static int separate_armature_exec(bContext *C, wmOperator *op) } MEM_freeN(bases); - /* recalc/redraw + cleanup */ + /* Recalculate/redraw + cleanup */ WM_cursor_wait(0); if (ok) { diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c index f0954a198a3..9d80a75b959 100644 --- a/source/blender/editors/gpencil/annotate_paint.c +++ b/source/blender/editors/gpencil/annotate_paint.c @@ -1075,7 +1075,9 @@ static void annotation_free_stroke(bGPDframe *gpf, bGPDstroke *gps) BLI_freelinkN(&gpf->strokes, gps); } -/* which which point is infront (result should only be used for comparison) */ +/** + * Which which point is in front (result should only be used for comparison). + */ static float view3d_point_depth(const RegionView3D *rv3d, const float co[3]) { if (rv3d->is_persp) { diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c index dd1da45b495..44b866d81d7 100644 --- a/source/blender/editors/gpencil/gpencil_data.c +++ b/source/blender/editors/gpencil/gpencil_data.c @@ -2534,8 +2534,8 @@ static void gpencil_joined_fix_animdata_cb(ID *id, FCurve *fcu, void *user_data) if (dtar->id == src_id) { dtar->id = dst_id; - /* Also check on the subtarget... - * We duplicate the logic from drivers_path_rename_fix() here, with our own + /* Also check on the sub-target. + * We duplicate the logic from #drivers_path_rename_fix() here, with our own * little twists so that we know that it isn't going to clobber the wrong data */ if (dtar->rna_path && strstr(dtar->rna_path, "layers[")) { diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 882ab1f983a..95133244dfb 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -1295,7 +1295,9 @@ static void gpencil_stroke_newfrombuffer(tGPsdata *p) /* --- 'Eraser' for 'Paint' Tool ------ */ -/* which which point is infront (result should only be used for comparison) */ +/** + * Which which point is in front (result should only be used for comparison). + */ static float view3d_point_depth(const RegionView3D *rv3d, const float co[3]) { if (rv3d->is_persp) { diff --git a/source/blender/editors/include/ED_screen_types.h b/source/blender/editors/include/ED_screen_types.h index 51f3eea74fa..9826ec8c3b8 100644 --- a/source/blender/editors/include/ED_screen_types.h +++ b/source/blender/editors/include/ED_screen_types.h @@ -131,7 +131,7 @@ enum { */ AZONE_FULLSCREEN, /** - * Hotspot azone around scroll-bars to show/hide them. + * Hot-spot #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/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 75706653a7c..baea948e122 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -364,7 +364,7 @@ static bool id_search_add(const bContext *C, int iconid = ui_id_icon_get(C, id, template_ui->preview); bool has_sep_char = (id->lib != NULL); - /* When using previews, the library hint (linked, overriden, missing) is added with a + /* When using previews, the library hint (linked, overridden, missing) is added with a * character prefix, otherwise we can use a icon. */ BKE_id_full_name_ui_prefix_get(name_ui, id, template_ui->preview, UI_SEP_CHAR); if (!template_ui->preview) { diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c index 5f5599b53df..369c7735d20 100644 --- a/source/blender/editors/mesh/editmesh_knife.c +++ b/source/blender/editors/mesh/editmesh_knife.c @@ -1895,12 +1895,12 @@ static BMFace *knife_find_closest_face(KnifeTool_OpData *kcd, if (!f) { if (kcd->is_interactive) { - /* try to use backbuffer selection method if ray casting failed */ + /* Try to use back-buffer selection method if ray casting failed. */ f = EDBM_face_find_nearest(&kcd->vc, &dist); /* cheat for now; just put in the origin instead * of a true coordinate on the face. - * This just puts a point 1.0f infront of the view. */ + * This just puts a point 1.0f in front of the view. */ add_v3_v3v3(co, origin, ray); } } @@ -1908,8 +1908,10 @@ static BMFace *knife_find_closest_face(KnifeTool_OpData *kcd, return f; } -/* find the 2d screen space density of vertices within a radius. used to scale snapping - * distance for picking edges/verts.*/ +/** + * Find the 2d screen space density of vertices within a radius. + * Used to scale snapping distance for picking edges/verts. + */ static int knife_sample_screen_density(KnifeTool_OpData *kcd, const float radius) { BMFace *f; diff --git a/source/blender/editors/screen/workspace_layout_edit.c b/source/blender/editors/screen/workspace_layout_edit.c index 7ce92bc3e4d..0af81e0db21 100644 --- a/source/blender/editors/screen/workspace_layout_edit.c +++ b/source/blender/editors/screen/workspace_layout_edit.c @@ -38,7 +38,7 @@ #include "screen_intern.h" /** - * Empty screen, with 1 dummy area without spacedata. Uses window size. + * Empty screen, with 1 dummy area without space-data. Uses window size. */ WorkSpaceLayout *ED_workspace_layout_add(Main *bmain, WorkSpace *workspace, diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index 5e3204b6d5a..dfb8f03fa6e 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -811,7 +811,7 @@ static bool project_paint_PickColor( } /** - * Check if 'pt' is infront of the 3 verts on the Z axis (used for screenspace occlusion test) + * Check if 'pt' is in front of the 3 verts on the Z axis (used for screen-space occlusion test) * \return * - `0`: no occlusion * - `-1`: no occlusion but 2D intersection is true @@ -836,7 +836,7 @@ static int project_paint_occlude_ptv(const float pt[3], } /* From here on we know there IS an intersection */ - /* if ALL of the verts are infront of us then we know it intersects ? */ + /* if ALL of the verts are in front of us then we know it intersects ? */ if (v1[2] < pt[2] && v2[2] < pt[2] && v3[2] < pt[2]) { return 1; } diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index 6dce1ef6b0e..7ac778630ac 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -1425,10 +1425,10 @@ static int wpaint_mode_toggle_exec(bContext *C, wmOperator *op) } } - /* Weightpaint works by overriding colors in mesh, - * so need to make sure we recalc on enter and + /* Weight-paint works by overriding colors in mesh, + * so need to make sure we recalculate on enter and * exit (exit needs doing regardless because we - * should redeform). + * should re-deform). */ DEG_id_tag_update(&me->id, 0); diff --git a/source/blender/editors/space_view3d/view3d_camera_control.c b/source/blender/editors/space_view3d/view3d_camera_control.c index daa3f641404..aeabe68c2d0 100644 --- a/source/blender/editors/space_view3d/view3d_camera_control.c +++ b/source/blender/editors/space_view3d/view3d_camera_control.c @@ -182,7 +182,7 @@ struct View3DCameraControl *ED_view3d_cameracontrol_acquire(Depsgraph *depsgraph copy_qt_qt(vctrl->rot_backup, rv3d->viewquat); copy_v3_v3(vctrl->ofs_backup, rv3d->ofs); - /* the dist defines a vector that is infront of the offset + /* The dist defines a vector that is in front of the offset * to rotate the view about. * this is no good for fly mode because we * want to rotate about the viewers center. diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index edd75d8e561..3c3dea1509d 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -4988,7 +4988,7 @@ void ED_view3d_cursor3d_position(bContext *C, ED_view3d_calc_zfac(rv3d, cursor_co, &flip); - /* reset the depth based on the view offset (we _know_ the offset is infront of us) */ + /* Reset the depth based on the view offset (we _know_ the offset is in front of us). */ if (flip) { negate_v3_v3(cursor_co, rv3d->ofs); /* re initialize, no need to check flip again */ diff --git a/source/blender/editors/space_view3d/view3d_project.c b/source/blender/editors/space_view3d/view3d_project.c index 3a0f0f468fc..f4ec9a22520 100644 --- a/source/blender/editors/space_view3d/view3d_project.c +++ b/source/blender/editors/space_view3d/view3d_project.c @@ -557,9 +557,9 @@ void ED_view3d_win_to_3d(const View3D *v3d, copy_v3_v3(ray_origin, rv3d->viewinv[3]); ED_view3d_win_to_vector(region, mval, ray_direction); - /* note, we could use isect_line_plane_v3() - * however we want the intersection to be infront of the view no matter what, - * so apply the unsigned factor instead */ + /* Note: we could use #isect_line_plane_v3() + * however we want the intersection to be in front of the view no matter what, + * so apply the unsigned factor instead. */ plane_from_point_normal_v3(plane, depth_pt, rv3d->viewinv[2]); isect_ray_plane_v3(ray_origin, ray_direction, plane, &lambda, false); diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c index fab851144ee..5d1fd1543df 100644 --- a/source/blender/editors/transform/transform_convert.c +++ b/source/blender/editors/transform/transform_convert.c @@ -774,7 +774,7 @@ bool constraints_list_needinv(TransInfo *t, ListBase *list) bConstraint *con; /* loop through constraints, checking if there's one of the mentioned - * constraints needing special crazyspace corrections + * constraints needing special crazy-space corrections */ if (list) { for (con = list->first; con; con = con->next) { diff --git a/source/blender/editors/transform/transform_convert_mask.c b/source/blender/editors/transform/transform_convert_mask.c index 66c27bca207..6f34c49bdac 100644 --- a/source/blender/editors/transform/transform_convert_mask.c +++ b/source/blender/editors/transform/transform_convert_mask.c @@ -149,7 +149,7 @@ static void MaskPointToTransData(Scene *scene, /* CV coords are scaled by aspects. this is needed for rotations and * proportional editing to be consistent with the stretched CV coords - * that are displayed. this also means that for display and numinput, + * that are displayed. this also means that for display and number-input, * and when the CV coords are flushed, these are converted each time */ mul_v2_m3v2(td2d->loc, parent_matrix, bezt->vec[i]); td2d->loc[0] *= asp[0]; diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c index ee80cedbfd8..fcb599401c4 100644 --- a/source/blender/editors/transform/transform_convert_mesh.c +++ b/source/blender/editors/transform/transform_convert_mesh.c @@ -794,11 +794,11 @@ void createTransEditVerts(TransInfo *t) t->depsgraph, scene_eval, obedit_eval, em_eval, &defmats, &defcos); } - /* if we still have more modifiers, also do crazyspace - * correction with quats, relative to the coordinates after - * the modifiers that support deform matrices (defcos) */ + /* If we still have more modifiers, also do crazy-space + * correction with \a quats, relative to the coordinates after + * the modifiers that support deform matrices \a defcos. */ -#if 0 /* TODO, fix crazyspace+extrude so it can be enabled for general use - campbell */ +#if 0 /* TODO, fix crazy-space & extrude so it can be enabled for general use - campbell */ if ((totleft > 0) || (totleft == -1)) #else if (totleft > 0) diff --git a/source/blender/editors/transform/transform_data.h b/source/blender/editors/transform/transform_data.h index bc95fdad59c..48ed9ecf34b 100644 --- a/source/blender/editors/transform/transform_data.h +++ b/source/blender/editors/transform/transform_data.h @@ -88,8 +88,8 @@ typedef struct TransDataExtension { * It is the same but without the #Bone.bone_mat, see #TD_PBONE_LOCAL_MTX_C. */ float l_smtx[3][3]; /** The rotscale matrix of pose bone, to allow using snap-align in translation mode, - * when td->mtx is the loc pose bone matrix (and hence can't be used to apply - * rotation in some cases, namely when a bone is in "NoLocal" or "Hinge" mode)... */ + * when #TransData.mtx is the loc pose bone matrix (and hence can't be used to apply + * rotation in some cases, namely when a bone is in "No-Local" or "Hinge" mode)... */ float r_mtx[3][3]; /** Inverse of previous one. */ float r_smtx[3][3]; -- cgit v1.2.3