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:
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r--source/blender/editors/space_view3d/drawobject.c8
-rw-r--r--source/blender/editors/space_view3d/view3d_buttons.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_edit.c4
-rw-r--r--source/blender/editors/space_view3d/view3d_fly.c4
-rw-r--r--source/blender/editors/space_view3d/view3d_header.c2
-rw-r--r--source/blender/editors/space_view3d/view3d_select.c4
6 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 2ab8ec8aa99..2596ba3f4bc 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -356,7 +356,7 @@ static float cube[8][3] = {
{ 1.0, 1.0, -1.0},
};
-/* ----------------- OpenGL Circle Drawing - Tables for Optimised Drawing Speed ------------------ */
+/* ----------------- OpenGL Circle Drawing - Tables for Optimized Drawing Speed ------------------ */
/* 32 values of sin function (still same result!) */
#define CIRCLE_RESOL 32
@@ -750,7 +750,7 @@ static void drawcentercircle(View3D *v3d, RegionView3D *rv3d, const float co[3],
float verts[CIRCLE_RESOL][3];
/* using gldepthfunc guarantees that it does write z values,
- * but not checks for it, so centers remain visible independt order of drawing */
+ * but not checks for it, so centers remain visible independent order of drawing */
if (v3d->zbuf) glDepthFunc(GL_ALWAYS);
glEnable(GL_BLEND);
@@ -1057,7 +1057,7 @@ static void spotvolume(float lvec[3], float vvec[3], const float inp)
plane[1]= 1.0f;
/* now we've got two equations: one of a cone and one of a plane, but we have
- * three unknowns. We remove one unkown by rotating the plane to z=0 (the plane normal) */
+ * three unknowns. We remove one unknown by rotating the plane to z=0 (the plane normal) */
/* rotate around cross product vector of (0,0,1) and plane normal, dot product degrees */
/* according definition, we derive cross product is (plane[1],-plane[0],0), en cos = plane[2]);*/
@@ -2819,7 +2819,7 @@ static void draw_em_measure_stats(View3D *v3d, Object *ob, BMEditMesh *em, UnitS
if (me->drawflag & ME_DRAWEXTRA_FACEAREA) {
/* would be nice to use BM_face_area_calc, but that is for 2d faces
- * so instead add up tessalation triangle areas */
+ * so instead add up tessellationf triangle areas */
BMFace *f;
int n;
diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c
index f9ee50387d1..a9521a61eb2 100644
--- a/source/blender/editors/space_view3d/view3d_buttons.c
+++ b/source/blender/editors/space_view3d/view3d_buttons.c
@@ -980,7 +980,7 @@ static void v3d_posearmature_buts(uiLayout *layout, Object *ob)
col = uiLayoutColumn(layout, 0);
/* XXX: RNA buts show data in native types (i.e. quats, 4-component axis/angle, etc.)
- * but oldskool UI shows in eulers always. Do we want to be able to still display in Eulers?
+ * but old-school UI shows in eulers always. Do we want to be able to still display in Eulers?
* Maybe needs RNA/ui options to display rotations as different types... */
v3d_transform_butsR(col, &pchanptr);
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index f3945d1680c..8666a0085c3 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -3542,10 +3542,10 @@ int ED_view3d_autodist_depth_seg(struct ARegion *ar, const int mval_sta[2], cons
}
/**
- * Gets the view trasnformation from a camera
+ * Gets the view transformation from a camera
* currently dosnt take camzoom into account
*
- * The dist is not modified for this function, if NULL its assimed zero
+ * The dist is not modified for this function, if NULL its assumed zero
*/
void ED_view3d_from_m4(float mat[][4], float ofs[3], float quat[4], float *dist)
{
diff --git a/source/blender/editors/space_view3d/view3d_fly.c b/source/blender/editors/space_view3d/view3d_fly.c
index 0ae2ae0a9d1..3218daf65c7 100644
--- a/source/blender/editors/space_view3d/view3d_fly.c
+++ b/source/blender/editors/space_view3d/view3d_fly.c
@@ -184,7 +184,7 @@ typedef struct FlyInfo {
/* relative view axis locking - xlock, zlock
* 0) disabled
- * 1) enabled but not checking because mouse hasnt moved outside the margin since locking was checked an not needed
+ * 1) enabled but not checking because mouse hasn't moved outside the margin since locking was checked an not needed
* when the mouse moves, locking is set to 2 so checks are done.
* 2) mouse moved and checking needed, if no view altering is donem its changed back to 1 */
short xlock, zlock;
@@ -583,7 +583,7 @@ static void flyEvent(FlyInfo *fly, wmEvent *event)
/* implement WASD keys */
case FLY_MODAL_DIR_FORWARD:
if (fly->speed < 0.0f) fly->speed= -fly->speed; /* flip speed rather than stopping, game like motion */
- else if (fly->axis==2) fly->speed += fly->grid; /* increse like mousewheel if were already
+ else if (fly->axis==2) fly->speed += fly->grid; /* increase like mousewheel if were already
* moving in that difection*/
fly->axis= 2;
break;
diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c
index b3ec1676bfb..17f5ab68633 100644
--- a/source/blender/editors/space_view3d/view3d_header.c
+++ b/source/blender/editors/space_view3d/view3d_header.c
@@ -130,7 +130,7 @@ static void handle_view3d_lock(bContext *C)
scene->layact= v3d->layact;
scene->camera= v3d->camera;
- /* not through notifiery, listener don't have context
+ /* not through notifier, listener don't have context
* and non-open screens or spaces need to be updated too */
BKE_screen_view3d_main_sync(&bmain->screen, scene);
diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c
index 15b1dde500b..93cf656dea4 100644
--- a/source/blender/editors/space_view3d/view3d_select.c
+++ b/source/blender/editors/space_view3d/view3d_select.c
@@ -2520,7 +2520,7 @@ static void pose_circle_select(ViewContext *vc, int select, const int mval[2], f
ED_view3d_init_mats_rv3d(vc->obact, vc->rv3d); /* for foreach's screen/vert projection */
/* check each PoseChannel... */
- // TODO: could be optimised at some point
+ // TODO: could be optimized at some point
for (pchan = pose->chanbase.first; pchan; pchan = pchan->next) {
short sco1[2], sco2[2], didpoint=0;
float vec[3];
@@ -2592,7 +2592,7 @@ static void armature_circle_select(ViewContext *vc, int select, const int mval[2
ED_view3d_init_mats_rv3d(vc->obedit, vc->rv3d); /* for foreach's screen/vert projection */
/* check each EditBone... */
- // TODO: could be optimised at some point
+ // TODO: could be optimized at some point
for (ebone= arm->edbo->first; ebone; ebone=ebone->next) {
short sco1[2], sco2[2], didpoint=0;
float vec[3];