diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/test/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_DisplayManagerSDL.cpp | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemSDL.cpp | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowSDL.cpp | 2 | ||||
-rw-r--r-- | intern/iksolver/intern/IK_QJacobianSolver.cpp | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt index 51cc47fa704..65a692acd03 100644 --- a/intern/cycles/test/CMakeLists.txt +++ b/intern/cycles/test/CMakeLists.txt @@ -15,7 +15,7 @@ if(WITH_GTESTS) Include(GTestTesting) - # Otherwise we get warnings here that we cant fix in external projects + # Otherwise we get warnings here that we can't fix in external projects remove_strict_flags() endif() diff --git a/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp b/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp index b836f256b27..11134ad1054 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp +++ b/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp @@ -160,7 +160,7 @@ GHOST_TSuccess GHOST_DisplayManagerSDL::setCurrentDisplaySetting( else { /* this is a problem for the BGE player :S, perhaps SDL2 will resolve at some point. * we really need SDL_SetDisplayModeForDisplay() to become an API func! - campbell */ - printf("no windows available, cant fullscreen\n"); + printf("no windows available, can't fullscreen\n"); /* do not fail, we will try again later when the window is created - wander */ return GHOST_kSuccess; diff --git a/intern/ghost/intern/GHOST_SystemSDL.cpp b/intern/ghost/intern/GHOST_SystemSDL.cpp index 8862d0457f2..eccef18bee2 100644 --- a/intern/ghost/intern/GHOST_SystemSDL.cpp +++ b/intern/ghost/intern/GHOST_SystemSDL.cpp @@ -376,7 +376,7 @@ void GHOST_SystemSDL::processEvent(SDL_Event *sdl_event) bounds.wrapPoint(x_new, y_new, 8, window->getCursorGrabAxis()); window->getCursorGrabAccum(x_accum, y_accum); - // cant use setCursorPosition because the mouse may have no focus! + // can't use setCursorPosition because the mouse may have no focus! if (x_new != x_root || y_new != y_root) { if (1) { //xme.time > m_last_warp) { /* when wrapping we don't need to add an event because the diff --git a/intern/ghost/intern/GHOST_WindowSDL.cpp b/intern/ghost/intern/GHOST_WindowSDL.cpp index dcb1ab8c78c..ff0c506feb7 100644 --- a/intern/ghost/intern/GHOST_WindowSDL.cpp +++ b/intern/ghost/intern/GHOST_WindowSDL.cpp @@ -556,7 +556,7 @@ static SDL_Cursor *sdl_ghost_CreateCursor( return cursor; } -/* TODO, this is currently never freed but it wont leak either. */ +/* TODO, this is currently never freed but it won't leak either. */ static SDL_Cursor *getStandardCursorShape(GHOST_TStandardCursor shape) { if (sdl_std_cursor_array[0] == NULL) { diff --git a/intern/iksolver/intern/IK_QJacobianSolver.cpp b/intern/iksolver/intern/IK_QJacobianSolver.cpp index 6c2c0bacf48..b8ad0b2c09c 100644 --- a/intern/iksolver/intern/IK_QJacobianSolver.cpp +++ b/intern/iksolver/intern/IK_QJacobianSolver.cpp @@ -89,7 +89,7 @@ bool IK_QJacobianSolver::Setup(IK_QSegment *root, std::list<IK_QTask *> &tasks) if (num_dof == 0) return false; - // compute task id's and assing weights to task + // compute task ids and assign weights to task int primary_size = 0, primary = 0; int secondary_size = 0, secondary = 0; double primary_weight = 0.0, secondary_weight = 0.0; @@ -237,7 +237,7 @@ void IK_QJacobianSolver::ConstrainPoleVector(IK_QSegment *root, std::list<IK_QTa bool IK_QJacobianSolver::UpdateAngles(double &norm) { - // assing each segment a unique id for the jacobian + // assign each segment a unique id for the jacobian std::vector<IK_QSegment *>::iterator seg; IK_QSegment *qseg, *minseg = NULL; double minabsdelta = 1e10, absdelta; |