diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-11-02 20:25:15 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-11-02 20:25:15 +0300 |
commit | 6bfcd5a811e08929505568eb1c9195459149b6fc (patch) | |
tree | a8de2dc5d23de126015b8a52c4c3c41b2ce5e8c5 | |
parent | 072a39004eef9f1eb479153888f0bf67b05aa125 (diff) |
how embarrassing!
-rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 16 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.h | 4 | ||||
-rw-r--r-- | release/scripts/ui/space_sequencer.py | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sequence.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_vertex.c | 4 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_view.c | 2 | ||||
-rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 2 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp | 18 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.h | 4 |
11 files changed, 30 insertions, 30 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index 2e89be40bcb..8a17d455695 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -132,8 +132,8 @@ GHOST_SystemWin32::GHOST_SystemWin32() : m_hasPerformanceCounter(false), m_freq(0), m_start(0), - m_seperateLeftRight(false), - m_seperateLeftRightInitialized(false) + m_separateLeftRight(false), + m_separateLeftRightInitialized(false) { m_displayManager = new GHOST_DisplayManagerWin32 (); GHOST_ASSERT(m_displayManager, "GHOST_SystemWin32::GHOST_SystemWin32(): m_displayManager==0\n"); @@ -274,7 +274,7 @@ GHOST_TSuccess GHOST_SystemWin32::getModifierKeys(GHOST_ModifierKeys& keys) cons It didn't work all that well on some newer hardware, and worked less well with the passage of time, so it was fully disabled in ME. */ - if (m_seperateLeftRight && m_seperateLeftRightInitialized) { + if (m_separateLeftRight && m_separateLeftRightInitialized) { bool down = HIBYTE(::GetKeyState(VK_LSHIFT)) != 0; keys.set(GHOST_kModifierKeyLeftShift, down); down = HIBYTE(::GetKeyState(VK_RSHIFT)) != 0; @@ -581,29 +581,29 @@ LRESULT WINAPI GHOST_SystemWin32::s_wndProc(HWND hwnd, UINT msg, WPARAM wParam, case VK_SHIFT: case VK_CONTROL: case VK_MENU: - if (!system->m_seperateLeftRightInitialized) { + if (!system->m_separateLeftRightInitialized) { // Check whether this system supports seperate left and right keys switch (wParam) { case VK_SHIFT: - system->m_seperateLeftRight = + system->m_separateLeftRight = (HIBYTE(::GetKeyState(VK_LSHIFT)) != 0) || (HIBYTE(::GetKeyState(VK_RSHIFT)) != 0) ? true : false; break; case VK_CONTROL: - system->m_seperateLeftRight = + system->m_separateLeftRight = (HIBYTE(::GetKeyState(VK_LCONTROL)) != 0) || (HIBYTE(::GetKeyState(VK_RCONTROL)) != 0) ? true : false; break; case VK_MENU: - system->m_seperateLeftRight = + system->m_separateLeftRight = (HIBYTE(::GetKeyState(VK_LMENU)) != 0) || (HIBYTE(::GetKeyState(VK_RMENU)) != 0) ? true : false; break; } - system->m_seperateLeftRightInitialized = true; + system->m_separateLeftRightInitialized = true; } system->processModifierKeys(window); // Bypass call to DefWindowProc diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h index 9387b6cad50..6a12975a3dd 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.h +++ b/intern/ghost/intern/GHOST_SystemWin32.h @@ -283,9 +283,9 @@ protected: /** High frequency timer variable. */ __int64 m_start; /** Stores the capability of this system to distinguish left and right modifier keys. */ - bool m_seperateLeftRight; + bool m_separateLeftRight; /** Stores the initialization state of the member m_leftRightDistinguishable. */ - bool m_seperateLeftRightInitialized; + bool m_separateLeftRightInitialized; }; diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index fa91320202d..ff24bef9ee7 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -118,7 +118,7 @@ class SEQUENCER_MT_view(bpy.types.Menu): if st.display_mode == 'IMAGE': layout.itemR(st, "draw_safe_margin") if st.display_mode == 'WAVEFORM': - layout.itemR(st, "seperate_color_preview") + layout.itemR(st, "separate_color_preview") """ if(!sa->full) uiDefIconTextBut(block, BUTM, B_FULL, ICON_BLANK1, "Maximize Window|Ctrl UpArrow", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0,0, ""); diff --git a/source/blender/blenkernel/intern/sequence.c b/source/blender/blenkernel/intern/sequence.c index 42251cc54df..1ab085f5fa8 100644 --- a/source/blender/blenkernel/intern/sequence.c +++ b/source/blender/blenkernel/intern/sequence.c @@ -1156,7 +1156,7 @@ static int seq_proxy_get_fname(Scene *scene, Sequence * seq, int cfra, char * na return TRUE; } - /* generate a seperate proxy directory for each preview size */ + /* generate a separate proxy directory for each preview size */ if (seq->type == SEQ_IMAGE) { StripElem * se = give_stripelem(seq, cfra); @@ -1285,7 +1285,7 @@ static void seq_proxy_build_frame(Scene *scene, Sequence * seq, int cfra, int re IMB_scalefastImBuf(ibuf, (short)rectx, (short)recty); } - /* quality is fixed, otherwise one has to generate seperate + /* quality is fixed, otherwise one has to generate separate directories for every quality... depth = 32 is intentionally left in, otherwise ALPHA channels diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 246da9ddf4c..65f1f9a2f70 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -2368,7 +2368,7 @@ void ui_draw_but(const bContext *C, ARegion *ar, uiStyle *style, uiBut *but, rct uiFontStyle *fstyle= &style->widget; uiWidgetType *wt= NULL; - /* handle menus seperately */ + /* handle menus separately */ if(but->dt==UI_EMBOSSP) { switch (but->type) { case LABEL: diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c index f425fa01ebe..408f4862b6f 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.c +++ b/source/blender/editors/sculpt_paint/paint_vertex.c @@ -389,7 +389,7 @@ void wpaint_fill(VPaint *wp, Object *ob, float paintweight) vgroup= ob->actdef-1; - /* directly copied from weight_paint, should probaby split into a seperate function */ + /* directly copied from weight_paint, should probaby split into a separate function */ /* if mirror painting, find the other group */ if(me->editflag & ME_EDIT_MIRROR_X) { bDeformGroup *defgroup= BLI_findlink(&ob->defbase, ob->actdef-1); @@ -990,7 +990,7 @@ void sample_wpaint(Scene *scene, ARegion *ar, View3D *v3d, int mode) static void do_weight_paint_auto_normalize(MDeformVert *dvert, int paint_nr, char *map) { - MDeformWeight *dw = dvert->dw; +// MDeformWeight *dw = dvert->dw; float sum=0.0f, fac=0.0f, paintw=0.0f; int i, tot=0; diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c index e2b22afae62..9fbc916c02d 100644 --- a/source/blender/editors/space_view3d/view3d_view.c +++ b/source/blender/editors/space_view3d/view3d_view.c @@ -1447,7 +1447,7 @@ void VIEW3D_OT_localview(wmOperatorType *ot) /* identifiers */ ot->name= "Local View"; - ot->description= "Toggle display of selected object(s) seperately and centered in view."; + ot->description= "Toggle display of selected object(s) separately and centered in view."; ot->idname= "VIEW3D_OT_localview"; /* api callbacks */ diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 8eef80d2912..2ad2f003d6c 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -1886,7 +1886,7 @@ void UV_OT_unlink_selection(wmOperatorType *ot) /* This function sets the selection on tagged faces, need because settings the * selection a face is done in a number of places but it also needs to respect * the sticky modes for the UV verts, so dealing with the sticky modes is best - * done in a seperate function. + * done in a separate function. * * De-selects faces that have been tagged on efa->tmp.l. */ diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index a12e26a7d7b..40b918b1ea2 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -1001,7 +1001,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Transform Markers", "Transform markers as well as strips."); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL); - prop= RNA_def_property(srna, "seperate_color_preview", PROP_BOOLEAN, PROP_NONE); + prop= RNA_def_property(srna, "separate_color_preview", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_DRAW_COLOR_SEPERATED); RNA_def_property_ui_text(prop, "Seperate Colors", "Seperate color channels in preview."); RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL); diff --git a/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp b/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp index 18724783307..0eb418ddfaf 100644 --- a/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp +++ b/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp @@ -72,8 +72,8 @@ GPW_KeyboardDevice::GPW_KeyboardDevice(void) { - m_seperateLeftRight = false; - m_seperateLeftRightInitialized = false; + m_separateLeftRight = false; + m_separateLeftRightInitialized = false; m_reverseKeyTranslateTable['A' ] = KX_AKEY ; m_reverseKeyTranslateTable['B' ] = KX_BKEY ; @@ -222,10 +222,10 @@ void GPW_KeyboardDevice::ConvertModifierKey(WPARAM wParam, bool isDown) It didn't work all that well on some newer hardware, and worked less well with the passage of time, so it was fully disabled in ME. */ - if (!m_seperateLeftRightInitialized && isDown) { + if (!m_separateLeftRightInitialized && isDown) { CheckForSeperateLeftRight(wParam); } - if (m_seperateLeftRight) { + if (m_separateLeftRight) { bool down = HIBYTE(::GetKeyState(VK_LSHIFT)) != 0; ConvertEvent(VK_LSHIFT, down); down = HIBYTE(::GetKeyState(VK_RSHIFT)) != 0; @@ -255,26 +255,26 @@ void GPW_KeyboardDevice::ConvertModifierKey(WPARAM wParam, bool isDown) void GPW_KeyboardDevice::CheckForSeperateLeftRight(WPARAM wParam) { - // Check whether this system supports seperate left and right keys + // Check whether this system supports separate left and right keys switch (wParam) { case VK_SHIFT: - m_seperateLeftRight = + m_separateLeftRight = (HIBYTE(::GetKeyState(VK_LSHIFT)) != 0) || (HIBYTE(::GetKeyState(VK_RSHIFT)) != 0) ? true : false; break; case VK_CONTROL: - m_seperateLeftRight = + m_separateLeftRight = (HIBYTE(::GetKeyState(VK_LCONTROL)) != 0) || (HIBYTE(::GetKeyState(VK_RCONTROL)) != 0) ? true : false; break; case VK_MENU: - m_seperateLeftRight = + m_separateLeftRight = (HIBYTE(::GetKeyState(VK_LMENU)) != 0) || (HIBYTE(::GetKeyState(VK_RMENU)) != 0) ? true : false; break; } - m_seperateLeftRightInitialized = true; + m_separateLeftRightInitialized = true; } diff --git a/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.h b/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.h index cae7488c70d..d8185f01ce9 100644 --- a/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.h +++ b/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.h @@ -57,9 +57,9 @@ protected: void CheckForSeperateLeftRight(WPARAM wParam); /** Stores the capability of this system to distinguish left and right modifier keys. */ - bool m_seperateLeftRight; + bool m_separateLeftRight; /** Stores the initialization state of the member m_leftRightDistinguishable. */ - bool m_seperateLeftRightInitialized; + bool m_separateLeftRightInitialized; }; #endif //_GPW_KEYBOARDDEVICE_H_ |