diff options
author | Jacques Lucke <jacques@blender.org> | 2021-05-21 13:20:36 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2021-05-21 13:20:36 +0300 |
commit | cfe5232226c43f78782be02848cac64d3576ebcc (patch) | |
tree | bfe6707ac9b1f8f45b2b872059e0fd40bed91e97 /intern/ghost | |
parent | aa6817616c17d323fe5da79bba8590f6b2fb1c1d (diff) | |
parent | ff51c2e89a0951d043a843435b4c25ba7a15e8e2 (diff) |
Merge branch 'master' into temp-attributes-paneltemp-attributes-panel
Diffstat (limited to 'intern/ghost')
-rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.h | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_Xr_intern.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h index 413a883784b..b004f7e7b19 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.h +++ b/intern/ghost/intern/GHOST_WindowWin32.h @@ -242,7 +242,7 @@ typedef enum { } GHOST_MouseCaptureEventWin32; /** - * GHOST window on M$ Windows OSs. + * GHOST window on MS Windows OSs. */ class GHOST_WindowWin32 : public GHOST_Window { public: diff --git a/intern/ghost/intern/GHOST_Xr_intern.h b/intern/ghost/intern/GHOST_Xr_intern.h index 87a62ed838b..0616e426da3 100644 --- a/intern/ghost/intern/GHOST_Xr_intern.h +++ b/intern/ghost/intern/GHOST_Xr_intern.h @@ -48,7 +48,7 @@ inline void copy_ghost_pose_to_openxr_pose(const GHOST_XrPose &ghost_pose, XrPosef &r_oxr_pose) { - /* Set and convert to OpenXR coodinate space. */ + /* Set and convert to OpenXR coordinate space. */ r_oxr_pose.position.x = ghost_pose.position[0]; r_oxr_pose.position.y = ghost_pose.position[1]; r_oxr_pose.position.z = ghost_pose.position[2]; |