Commit: 90cc2643e9903bb324502c1ba5d24e13fc5e4469
Author: Mike Erwin
Date: Thu Feb 26 14:11:39 2015 -0500
Branches: master
https://developer.blender.org/rB90cc2643e9903bb324502c1ba5d24e13fc5e4469
cleanup: spelling & typos
Comments only, no functional change.
===================================================================
M intern/ghost/intern/GHOST_ContextCGL.h
M intern/ghost/intern/GHOST_NDOFManagerX11.cpp
M intern/ghost/intern/GHOST_SystemWin32.cpp
M source/blender/editors/include/BIF_glutil.h
M source/blender/editors/interface/interface_draw.c
M source/blender/editors/screen/glutil.c
M source/blender/editors/transform/transform.c
===================================================================
diff --git a/intern/ghost/intern/GHOST_ContextCGL.h
b/intern/ghost/intern/GHOST_ContextCGL.h
index 8619a13..92fdbfc 100644
--- a/intern/ghost/intern/GHOST_ContextCGL.h
+++ b/intern/ghost/intern/GHOST_ContextCGL.h
@@ -140,7 +140,7 @@ private:
const int m_contextFlags;
const int m_contextResetNotificationStrategy;
- /** The opgnGL drawing context */
+ /** The OpenGL drawing context */
NSOpenGLContext *m_openGLContext;
//static CGLEWContext *s_cglewContext;
diff --git a/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
b/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
index c72485e..de44b36 100644
--- a/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
+++ b/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
@@ -58,7 +58,7 @@ GHOST_NDOFManagerX11::GHOST_NDOFManagerX11(GHOST_System& sys)
}
else {
#ifdef DEBUG
- /* annoying for official builds, just adds noise and most
prople don't own these */
+ /* annoying for official builds, just adds noise and most
people don't own these */
puts("ndof: spacenavd not found");
/* This isn't a hard error, just means the user doesn't have a
3D mouse. */
#endif
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp
b/intern/ghost/intern/GHOST_SystemWin32.cpp
index f711bc0..30f8afd 100644
--- a/intern/ghost/intern/GHOST_SystemWin32.cpp
+++ b/intern/ghost/intern/GHOST_SystemWin32.cpp
@@ -1128,7 +1128,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd,
UINT msg, WPARAM wParam,
* until it finds a window that
processes it.
*/
- /* Get the winow under the mouse and
send event to it's queue. */
+ /* Get the window under the mouse and
send event to its queue. */
POINT mouse_pos =
{GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)};
HWND mouse_hwnd =
ChildWindowFromPoint(HWND_DESKTOP, mouse_pos);
GHOST_WindowWin32 *mouse_window =
(GHOST_WindowWin32 *)::GetWindowLongPtr(mouse_hwnd, GWLP_USERDATA);
@@ -1136,7 +1136,7 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd,
UINT msg, WPARAM wParam,
event =
processWheelEvent(mouse_window, wParam, lParam);
}
else {
- /* Happens when wmouse is not
over of any of blender windows. */
+ /* Happens when mouse is not
over any of blender's windows. */
event =
processWheelEvent(window, wParam, lParam);
}
diff --git a/source/blender/editors/include/BIF_glutil.h
b/source/blender/editors/include/BIF_glutil.h
index 4272fd4..4dc3968 100644
--- a/source/blender/editors/include/BIF_glutil.h
+++ b/source/blender/editors/include/BIF_glutil.h
@@ -90,13 +90,13 @@ void glutil_draw_lined_arc(float start, float angle, float
radius, int nsegments
void glutil_draw_filled_arc(float start, float angle, float radius, int
nsegments);
/**
- * Routines an integer value as obtained by glGetIntegerv.
+ * Returns an integer value as obtained by glGetIntegerv.
* The param must cause only one value to be gotten from GL.
*/
int glaGetOneInteger(int param);
/**
- * Routines a float value as obtained by glGetIntegerv.
+ * Returns a float value as obtained by glGetFloatv.
* The param must cause only one value to be gotten from GL.
*/
float glaGetOneFloat(int param);
@@ -164,8 +164,8 @@ void glaDrawPixelsTexScaled(float x, float y, int img_w,
int img_h, int format,
/** Define a 2D area (viewport, scissor, matrices) for OpenGL rendering.
*
- * glwDefine2DArea and glaBegin2DDraw set up an OpenGL state appropriate
- * for drawing using both vertice (Vertex, etc) and raster (RasterPos, Rect)
+ * glaDefine2DArea and glaBegin2DDraw set up an OpenGL state appropriate
+ * for drawing using both vertex (Vertex, etc) and raster (RasterPos, Rect)
* commands. All coordinates should be at integer positions. There is little
* to no reason to use glVertex2f etc. functions during 2D rendering, and
* thus no reason to +-0.5 the coordinates or perform other silly
diff --git a/source/blender/editors/interface/interface_draw.c
b/source/blender/editors/interface/interface_draw.c
index e03ea5e..07d580b 100644
--- a/source/blender/editors/interface/interface_draw.c
+++ b/source/blender/editors/interface/interface_draw.c
@@ -65,7 +65,7 @@ static int roundboxtype = UI_CNR_ALL;
void UI_draw_roundbox_corner_set(int type)
{
/* Not sure the roundbox function is the best place to change this
- * if this is undone, its not that big a deal, only makes curves edges
+ * if this is undone, it's not that big a deal, only makes curves edges
* square for the */
roundboxtype = type;
diff --git a/source/blender/editors/screen/glutil.c
b/source/blender/editors/screen/glutil.c
index 4c1698b..6001534 100644
--- a/source/blender/editors/screen/glutil.c
+++ b/source/blender/editors/screen/glutil.c
@@ -839,7 +839,7 @@ void gla2DDrawTranslatePt(gla2DDrawInfo *di, float wo_x,
float wo_y, int *r_sc_x
}
/**
- * Translate the \a world point from world coordiantes into screen space.
+ * Translate the \a world point from world coordinates into screen space.
*/
void gla2DDrawTranslatePtv(gla2DDrawInfo *di, float world[2], int screen_r[2])
{
@@ -848,7 +848,7 @@ void gla2DDrawTranslatePtv(gla2DDrawInfo *di, float
world[2], int screen_r[2])
}
/**
- * Restores the previous OpenGL state and free's the auxilary gla data.
+ * Restores the previous OpenGL state and frees the auxiliary gla data.
*/
void glaEnd2DDraw(gla2DDrawInfo *di)
{
diff --git a/source/blender/editors/transform/transform.c
b/source/blender/editors/transform/transform.c
index 4c95bd8..061d004 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -6781,7 +6781,7 @@ static eRedrawFlag handleEventVertSlide(struct TransInfo
*t, const struct wmEven
#endif
case MOUSEMOVE:
{
- /* don't recalculat the best edge */
+ /* don't recalculate the best edge */
const bool is_clamp = !(t->flag &
T_ALT_TRANSFORM);
if (is_clamp) {
calcVertSlideMouseActiveEdges(t, event->mval);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
