diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-12-08 11:46:21 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-12-08 11:46:21 +0300 |
commit | 690345a826544aec7a30b1d39966d867d093a8d1 (patch) | |
tree | b49bca28496bc5f4e22618c375444f6b5f4b3092 | |
parent | 7ba2b37a8a7837695c74d354f44084c2f917adba (diff) |
Cleanup: spelling
-rw-r--r-- | intern/cycles/kernel/kernel_types.h | 2 | ||||
-rw-r--r-- | intern/cycles/render/shader.h | 2 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_ImeWin32.h | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 3 |
4 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 1595f7a715a..460ca7b68eb 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -541,7 +541,7 @@ typedef enum AttributeStandard { /* This struct is to be 16 bytes aligned, we also keep some extra precautions: * - All the float3 members are in the beginning of the struct, so compiler - * does not put own pddings trying to align this members. + * does not put own padding trying to align this members. * - We make sure OSL pointer is also 16 bytes aligned. */ typedef struct ShaderClosure { diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h index 29c10ffa4f3..509c9385e6d 100644 --- a/intern/cycles/render/shader.h +++ b/intern/cycles/render/shader.h @@ -19,7 +19,7 @@ #ifdef WITH_OSL # if defined(_MSC_VER) -/* Prevent OSL from pollyting the context with weird macroses from windows.h. +/* Prevent OSL from polluting the context with weird macros from windows.h. * TODO(sergey): Ideally it's only enough to have class/struct declarations in * the header and skip header include here. */ diff --git a/intern/ghost/intern/GHOST_ImeWin32.h b/intern/ghost/intern/GHOST_ImeWin32.h index 3c73263a371..5b2d71875e8 100644 --- a/intern/ghost/intern/GHOST_ImeWin32.h +++ b/intern/ghost/intern/GHOST_ImeWin32.h @@ -114,7 +114,7 @@ struct ImeComposition { /** * Represents the type of the string in the 'ime_string' parameter. - * Its possible values and description are listed bwlow: + * Its possible values and description are listed below: * Value Description * 0 The parameter is not used. * GCS_RESULTSTR The parameter represents a result string. diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 3de34e7ca3f..35542410cd8 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -3508,7 +3508,8 @@ bool WM_event_is_tablet(const struct wmEvent *event) #ifdef WITH_INPUT_IME /* most os using ctrl/oskey + space to switch ime, avoid added space */ -bool WM_event_is_ime_switch(const struct wmEvent *event) { +bool WM_event_is_ime_switch(const struct wmEvent *event) +{ return event->val == KM_PRESS && event->type == SPACEKEY && (event->ctrl || event->oskey || event->shift || event->alt); } |