[Bf-blender-cvs] [dc4feed59dd] master: Cleanup: view-port --> 2D/3D Viewport
Aaron Carlisle
noreply at git.blender.org
Thu Dec 3 00:16:34 CET 2020
Commit: dc4feed59dda2b2b346136d369ce70e1756e87c3
Author: Aaron Carlisle
Date: Wed Dec 2 18:16:04 2020 -0500
Branches: master
https://developer.blender.org/rBdc4feed59dda2b2b346136d369ce70e1756e87c3
Cleanup: view-port --> 2D/3D Viewport
===================================================================
M release/scripts/startup/bl_operators/clip.py
M release/scripts/startup/bl_operators/image.py
M source/blender/blenkernel/intern/layer.c
M source/blender/editors/mesh/editmesh_select.c
M source/blender/editors/space_text/text_draw.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_intern.h
M source/blender/editors/space_view3d/view3d_utils.c
M source/blender/makesdna/DNA_meshdata_types.h
M source/blender/makesdna/DNA_vfont_types.h
===================================================================
diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py
index a3c54a7b069..51a9695e44a 100644
--- a/release/scripts/startup/bl_operators/clip.py
+++ b/release/scripts/startup/bl_operators/clip.py
@@ -414,8 +414,8 @@ class CLIP_OT_delete_proxy(Operator):
class CLIP_OT_set_viewport_background(Operator):
- """Set current movie clip as a camera background in 3D view-port """ \
- """(works only when a 3D view-port is visible)"""
+ """Set current movie clip as a camera background in 3D Viewport """ \
+ """(works only when a 3D Viewport is visible)"""
bl_idname = "clip.set_viewport_background"
bl_label = "Set as Background"
diff --git a/release/scripts/startup/bl_operators/image.py b/release/scripts/startup/bl_operators/image.py
index 8d543daeac7..f2cd0ad7478 100644
--- a/release/scripts/startup/bl_operators/image.py
+++ b/release/scripts/startup/bl_operators/image.py
@@ -116,7 +116,7 @@ class EditExternally(Operator):
class ProjectEdit(Operator):
- """Edit a snapshot of the view-port in an external image editor"""
+ """Edit a snapshot of the 3D Viewport in an external image editor"""
bl_idname = "image.project_edit"
bl_label = "Project Edit"
bl_options = {'REGISTER'}
diff --git a/source/blender/blenkernel/intern/layer.c b/source/blender/blenkernel/intern/layer.c
index 0757cf791b7..73b330bc0de 100644
--- a/source/blender/blenkernel/intern/layer.c
+++ b/source/blender/blenkernel/intern/layer.c
@@ -1261,7 +1261,7 @@ void BKE_layer_collection_local_sync(ViewLayer *view_layer, const View3D *v3d)
}
/**
- * Sync the local collection for all the view-ports.
+ * Sync the local collection for all the 3D Viewports.
*/
void BKE_layer_collection_local_sync_all(const Main *bmain)
{
diff --git a/source/blender/editors/mesh/editmesh_select.c b/source/blender/editors/mesh/editmesh_select.c
index 4dd543e71a9..a2fe949b6c5 100644
--- a/source/blender/editors/mesh/editmesh_select.c
+++ b/source/blender/editors/mesh/editmesh_select.c
@@ -3574,7 +3574,7 @@ static int edbm_select_linked_pick_invoke(bContext *C, wmOperator *op, const wmE
/* To support redo. */
{
- /* Note that the `base_index` can't be used as the index depends on the view-port
+ /* Note that the `base_index` can't be used as the index depends on the 3D Viewport
* which might not be available on redo. */
BM_mesh_elem_index_ensure(bm, ele->head.htype);
int object_index;
diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c
index 2c9ea1d6afa..849766851aa 100644
--- a/source/blender/editors/space_text/text_draw.c
+++ b/source/blender/editors/space_text/text_draw.c
@@ -886,7 +886,7 @@ static void calc_text_rcts(SpaceText *st, ARegion *region, rcti *scroll, rcti *b
scroll->ymin = pix_top_margin;
scroll->ymax = pix_available;
- /* when re-sizing a view-port with the bar at the bottom to a greater height
+ /* when re-sizing a 2D Viewport with the bar at the bottom to a greater height
* more blank lines will be added */
if (ltexth + blank_lines < st->top + st->runtime.viewlines) {
blank_lines = st->top + st->runtime.viewlines - ltexth;
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 3b5dc3f57b9..797c7d73df3 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -848,7 +848,7 @@ void ED_view3d_draw_depth(Depsgraph *depsgraph, ARegion *region, View3D *v3d, bo
/* get surface depth without bias */
rv3d->rflag |= RV3D_ZOFFSET_DISABLED;
- /* Needed in cases the view-port isn't already setup. */
+ /* Needed in cases the 3D Viewport isn't already setup. */
WM_draw_region_viewport_ensure(region, SPACE_VIEW3D);
WM_draw_region_viewport_bind(region);
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index f9de462813f..9429da342a6 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -222,7 +222,7 @@ typedef struct ViewOpsData {
/** Current state. */
struct {
/** Working copy of #RegionView3D.viewquat, needed for rotation calculation
- * so we can apply snap to the view-port while keeping the unsnapped rotation
+ * so we can apply snap to the 3D Viewport while keeping the unsnapped rotation
* here to use when snap is disabled and for continued calculation. */
float viewquat[4];
} curr;
diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h
index 0815850d694..118ec2425fc 100644
--- a/source/blender/editors/space_view3d/view3d_intern.h
+++ b/source/blender/editors/space_view3d/view3d_intern.h
@@ -171,7 +171,7 @@ bool ED_view3d_boundbox_clip_ex(const RegionView3D *rv3d,
bool ED_view3d_boundbox_clip(RegionView3D *rv3d, const struct BoundBox *bb);
/**
- * Parameters for setting the new view-port state.
+ * Parameters for setting the new 3D Viewport state.
*
* Each of the struct members may be NULL to signify they aren't to be adjusted.
*/
diff --git a/source/blender/editors/space_view3d/view3d_utils.c b/source/blender/editors/space_view3d/view3d_utils.c
index a70e74665c5..1be9bd27c7a 100644
--- a/source/blender/editors/space_view3d/view3d_utils.c
+++ b/source/blender/editors/space_view3d/view3d_utils.c
@@ -574,11 +574,11 @@ bool ED_view3d_persp_ensure(const Depsgraph *depsgraph, View3D *v3d, ARegion *re
/* -------------------------------------------------------------------- */
/** \name Camera Lock API
*
- * Lock the camera to the view-port, allowing view manipulation to transform the camera.
+ * Lock the camera to the 3D Viewport, allowing view manipulation to transform the camera.
* \{ */
/**
- * \return true when the view-port is locked to its camera.
+ * \return true when the 3D Viewport is locked to its camera.
*/
bool ED_view3d_camera_lock_check(const View3D *v3d, const RegionView3D *rv3d)
{
@@ -587,8 +587,8 @@ bool ED_view3d_camera_lock_check(const View3D *v3d, const RegionView3D *rv3d)
}
/**
- * Apply the camera object transformation to the view-port.
- * (needed so we can use regular view-port manipulation operators, that sync back to the camera).
+ * Apply the camera object transformation to the 3D Viewport.
+ * (needed so we can use regular 3D Viewport manipulation operators, that sync back to the camera).
*/
void ED_view3d_camera_lock_init_ex(const Depsgraph *depsgraph,
View3D *v3d,
@@ -612,7 +612,7 @@ void ED_view3d_camera_lock_init(const Depsgraph *depsgraph, View3D *v3d, RegionV
}
/**
- * Apply the view-port transformation back to the camera object.
+ * Apply the 3D Viewport transformation back to the camera object.
*
* \return true if the camera is moved.
*/
diff --git a/source/blender/makesdna/DNA_meshdata_types.h b/source/blender/makesdna/DNA_meshdata_types.h
index b2f8d845815..780115a31be 100644
--- a/source/blender/makesdna/DNA_meshdata_types.h
+++ b/source/blender/makesdna/DNA_meshdata_types.h
@@ -340,7 +340,7 @@ enum {
};
/**
- * \note While alpha is currently is not in the view-port,
+ * \note While alpha is not currently in the 3D Viewport,
* this may eventually be added back, keep this value set to 255.
*/
typedef struct MLoopCol {
diff --git a/source/blender/makesdna/DNA_vfont_types.h b/source/blender/makesdna/DNA_vfont_types.h
index 6f0820ff62c..bc1a71102da 100644
--- a/source/blender/makesdna/DNA_vfont_types.h
+++ b/source/blender/makesdna/DNA_vfont_types.h
@@ -20,7 +20,7 @@
/** \file
* \ingroup DNA
*
- * Vector Fonts used for text in the 3D view-port
+ * Vector Fonts used for text in the 3D Viewport
* (unrelated to text used to render the GUI).
*/
More information about the Bf-blender-cvs
mailing list