diff options
author | Campbell Barton <ideasman42@gmail.com> | 2020-03-17 03:32:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2020-03-17 03:34:11 +0300 |
commit | b87997f59b41471f7f79d9071846b2145589d9b2 (patch) | |
tree | 78b924d46309be41d04494c6b3c18e28ec560a5d /source/blender/editors | |
parent | ab430cfdfe1c8214f1096d23e102cba706b59adc (diff) |
Cleanup: rename 'centre' to 'center' in View3D
Diffstat (limited to 'source/blender/editors')
7 files changed, 22 insertions, 21 deletions
diff --git a/source/blender/editors/armature/armature_naming.c b/source/blender/editors/armature/armature_naming.c index 1f421d23b27..bad4edbabaf 100644 --- a/source/blender/editors/armature/armature_naming.c +++ b/source/blender/editors/armature/armature_naming.c @@ -359,9 +359,9 @@ void ED_armature_bone_rename(Main *bmain, for (sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { View3D *v3d = (View3D *)sl; - if (v3d->ob_centre && v3d->ob_centre->data == arm) { - if (STREQ(v3d->ob_centre_bone, oldname)) { - BLI_strncpy(v3d->ob_centre_bone, newname, MAXBONENAME); + if (v3d->ob_center && v3d->ob_center->data == arm) { + if (STREQ(v3d->ob_center_bone, oldname)) { + BLI_strncpy(v3d->ob_center_bone, newname, MAXBONENAME); } } } diff --git a/source/blender/editors/gpencil/gpencil_primitive.c b/source/blender/editors/gpencil/gpencil_primitive.c index 66c0131cd61..5cb34b1c08b 100644 --- a/source/blender/editors/gpencil/gpencil_primitive.c +++ b/source/blender/editors/gpencil/gpencil_primitive.c @@ -202,7 +202,7 @@ static void gp_rotate_v2_v2v2fl(float v[2], add_v2_v2v2(v, r, origin); } -/* Helper to rotate line around line centre */ +/* Helper to rotate line around line center. */ static void gp_primitive_rotate_line( float va[2], float vb[2], const float a[2], const float b[2], const float angle) { diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 020c58270fc..b2fc6c6e4cc 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -1523,12 +1523,12 @@ static void view3d_id_remap(ScrArea *sa, SpaceLink *slink, ID *old_id, ID *new_i /* Values in local-view aren't used, see: T52663 */ if (is_local == false) { - if ((ID *)v3d->ob_centre == old_id) { - v3d->ob_centre = (Object *)new_id; + if ((ID *)v3d->ob_center == old_id) { + v3d->ob_center = (Object *)new_id; /* Otherwise, bonename may remain valid... * We could be smart and check this, too? */ if (new_id == NULL) { - v3d->ob_centre_bone[0] = '\0'; + v3d->ob_center_bone[0] = '\0'; } } } diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c index 13b38a04f63..a7136cc580c 100644 --- a/source/blender/editors/space_view3d/view3d_edit.c +++ b/source/blender/editors/space_view3d/view3d_edit.c @@ -3182,7 +3182,7 @@ static int view_lock_to_active_exec(bContext *C, wmOperator *UNUSED(op)) if (v3d) { ED_view3d_lock_clear(v3d); - v3d->ob_centre = obact; /* can be NULL */ + v3d->ob_center = obact; /* can be NULL */ if (obact && obact->type == OB_ARMATURE) { if (obact->mode & OB_MODE_POSE) { @@ -3190,13 +3190,13 @@ static int view_lock_to_active_exec(bContext *C, wmOperator *UNUSED(op)) Object *obact_eval = DEG_get_evaluated_object(depsgraph, obact); bPoseChannel *pcham_act = BKE_pose_channel_active(obact_eval); if (pcham_act) { - BLI_strncpy(v3d->ob_centre_bone, pcham_act->name, sizeof(v3d->ob_centre_bone)); + BLI_strncpy(v3d->ob_center_bone, pcham_act->name, sizeof(v3d->ob_center_bone)); } } else { EditBone *ebone_act = ((bArmature *)obact->data)->act_edbone; if (ebone_act) { - BLI_strncpy(v3d->ob_centre_bone, ebone_act->name, sizeof(v3d->ob_centre_bone)); + BLI_strncpy(v3d->ob_center_bone, ebone_act->name, sizeof(v3d->ob_center_bone)); } } } @@ -5140,7 +5140,7 @@ void ED_view3d_cursor3d_update(bContext *C, } /* offset the cursor lock to avoid jumping to new offset */ - if (v3d->ob_centre_cursor) { + if (v3d->ob_center_cursor) { if (U.uiflag & USER_LOCK_CURSOR_ADJUST) { float co_2d_curr[2], co_2d_prev[2]; diff --git a/source/blender/editors/space_view3d/view3d_utils.c b/source/blender/editors/space_view3d/view3d_utils.c index e7153ddd361..bad283740c8 100644 --- a/source/blender/editors/space_view3d/view3d_utils.c +++ b/source/blender/editors/space_view3d/view3d_utils.c @@ -398,7 +398,7 @@ bool ED_view3d_boundbox_clip(RegionView3D *rv3d, const BoundBox *bb) bool ED_view3d_offset_lock_check(const View3D *v3d, const RegionView3D *rv3d) { - return (rv3d->persp != RV3D_CAMOB) && (v3d->ob_centre_cursor || v3d->ob_centre); + return (rv3d->persp != RV3D_CAMOB) && (v3d->ob_center_cursor || v3d->ob_center); } /** @@ -416,9 +416,10 @@ void ED_view3d_lastview_store(RegionView3D *rv3d) void ED_view3d_lock_clear(View3D *v3d) { - v3d->ob_centre = NULL; - v3d->ob_centre_bone[0] = '\0'; - v3d->ob_centre_cursor = false; + v3d->ob_center = NULL; + v3d->ob_center_bone[0] = '\0'; + v3d->ob_center_cursor = false; + v3d->flag2 &= ~V3D_LOCK_CAMERA; } diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index ee41b73ed16..b27bdf93389 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -834,13 +834,13 @@ void view3d_viewmatrix_set(Depsgraph *depsgraph, if (rv3d->persp == RV3D_PERSP) { rv3d->viewmat[3][2] -= rv3d->dist; } - if (v3d->ob_centre) { - Object *ob_eval = DEG_get_evaluated_object(depsgraph, v3d->ob_centre); + if (v3d->ob_center) { + Object *ob_eval = DEG_get_evaluated_object(depsgraph, v3d->ob_center); float vec[3]; copy_v3_v3(vec, ob_eval->obmat[3]); - if (ob_eval->type == OB_ARMATURE && v3d->ob_centre_bone[0]) { - bPoseChannel *pchan = BKE_pose_channel_find_name(ob_eval->pose, v3d->ob_centre_bone); + if (ob_eval->type == OB_ARMATURE && v3d->ob_center_bone[0]) { + bPoseChannel *pchan = BKE_pose_channel_find_name(ob_eval->pose, v3d->ob_center_bone); if (pchan) { copy_v3_v3(vec, pchan->pose_mat[3]); mul_m4_v3(ob_eval->obmat, vec); @@ -849,7 +849,7 @@ void view3d_viewmatrix_set(Depsgraph *depsgraph, translate_m4(rv3d->viewmat, -vec[0], -vec[1], -vec[2]); use_lock_ofs = true; } - else if (v3d->ob_centre_cursor) { + else if (v3d->ob_center_cursor) { float vec[3]; copy_v3_v3(vec, scene->cursor.location); translate_m4(rv3d->viewmat, -vec[0], -vec[1], -vec[2]); diff --git a/source/blender/editors/transform/transform_convert.c b/source/blender/editors/transform/transform_convert.c index 4ccb97b7a00..0a2e05e6f49 100644 --- a/source/blender/editors/transform/transform_convert.c +++ b/source/blender/editors/transform/transform_convert.c @@ -2760,7 +2760,7 @@ void createTransData(bContext *C, TransInfo *t) t->flag |= T_CAMERA; } } - else if (v3d->ob_centre && v3d->ob_centre->id.tag & LIB_TAG_DOIT) { + else if (v3d->ob_center && v3d->ob_center->id.tag & LIB_TAG_DOIT) { t->flag |= T_CAMERA; } } |