Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-27 16:49:59 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-09-27 16:49:59 +0300
commit58adc586612e695d04033f2029362f279a9c05a4 (patch)
tree0ebe8d1958f179e54a07eb44456002d46816a593 /source/blender/editors/space_view3d/view3d_draw.c
parent0f6b2504f80edddc76c104e9df0722fbb7d484a7 (diff)
parenta247b53084760498ca81eb6bdb901dee8f3a02ca (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_draw.c')
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 1091b7a7f63..735b4e5bec0 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1194,7 +1194,7 @@ void view3d_draw_region_info(const bContext *C, ARegion *ar, const int UNUSED(of
/* correct projection matrix */
ED_region_pixelspace(ar);
- /* local coordinate visible rect inside region, to accomodate overlapping ui */
+ /* local coordinate visible rect inside region, to accommodate overlapping ui */
rcti rect;
ED_region_visible_rect(ar, &rect);
@@ -1255,14 +1255,14 @@ static void view3d_draw_view(const bContext *C, ARegion *ar)
{
ED_view3d_draw_setup_view(CTX_wm_window(C), CTX_data_depsgraph(C), CTX_data_scene(C), ar, CTX_wm_view3d(C), NULL, NULL, NULL);
- /* Only 100% compliant on new spec goes bellow */
+ /* Only 100% compliant on new spec goes below */
DRW_draw_view(C);
}
RenderEngineType *ED_view3d_engine_type(Scene *scene, int drawtype)
{
/*
- * Tempory viewport draw modes until we have a proper system.
+ * Temporary viewport draw modes until we have a proper system.
* all modes are done in the draw manager, except
* cycles material as it is an external render engine.
*/