[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24254] trunk/blender: how embarrassing!
joe
joeedh at gmail.com
Tue Nov 3 03:55:05 CET 2009
did you use spaces for tabs? :)
On Mon, Nov 2, 2009 at 9:25 AM, Campbell Barton <ideasman42 at gmail.com> wrote:
> Revision: 24254
> http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24254
> Author: campbellbarton
> Date: 2009-11-02 18:25:15 +0100 (Mon, 02 Nov 2009)
>
> Log Message:
> -----------
> how embarrassing!
>
> Modified Paths:
> --------------
> trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
> trunk/blender/intern/ghost/intern/GHOST_SystemWin32.h
> trunk/blender/release/scripts/ui/space_sequencer.py
> trunk/blender/source/blender/blenkernel/intern/sequence.c
> trunk/blender/source/blender/editors/interface/interface_widgets.c
> trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
> trunk/blender/source/blender/editors/space_view3d/view3d_view.c
> trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
> trunk/blender/source/blender/makesrna/intern/rna_space.c
> trunk/blender/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp
> trunk/blender/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.h
>
> Modified: trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
> ===================================================================
> --- trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2009-11-02 17:24:06 UTC (rev 24253)
> +++ trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2009-11-02 17:25:15 UTC (rev 24254)
> @@ -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 @@
> 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 @@
> 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
>
> Modified: trunk/blender/intern/ghost/intern/GHOST_SystemWin32.h
> ===================================================================
> --- trunk/blender/intern/ghost/intern/GHOST_SystemWin32.h 2009-11-02 17:24:06 UTC (rev 24253)
> +++ trunk/blender/intern/ghost/intern/GHOST_SystemWin32.h 2009-11-02 17:25:15 UTC (rev 24254)
> @@ -283,9 +283,9 @@
> /** 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;
>
> };
>
>
> Modified: trunk/blender/release/scripts/ui/space_sequencer.py
> ===================================================================
> --- trunk/blender/release/scripts/ui/space_sequencer.py 2009-11-02 17:24:06 UTC (rev 24253)
> +++ trunk/blender/release/scripts/ui/space_sequencer.py 2009-11-02 17:25:15 UTC (rev 24254)
> @@ -118,7 +118,7 @@
> 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, "");
>
> Modified: trunk/blender/source/blender/blenkernel/intern/sequence.c
> ===================================================================
> --- trunk/blender/source/blender/blenkernel/intern/sequence.c 2009-11-02 17:24:06 UTC (rev 24253)
> +++ trunk/blender/source/blender/blenkernel/intern/sequence.c 2009-11-02 17:25:15 UTC (rev 24254)
> @@ -1156,7 +1156,7 @@
> 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 @@
> 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
>
> Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
> ===================================================================
> --- trunk/blender/source/blender/editors/interface/interface_widgets.c 2009-11-02 17:24:06 UTC (rev 24253)
> +++ trunk/blender/source/blender/editors/interface/interface_widgets.c 2009-11-02 17:25:15 UTC (rev 24254)
> @@ -2368,7 +2368,7 @@
> uiFontStyle *fstyle= &style->widget;
> uiWidgetType *wt= NULL;
>
> - /* handle menus seperately */
> + /* handle menus separately */
> if(but->dt==UI_EMBOSSP) {
> switch (but->type) {
> case LABEL:
>
> Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
> ===================================================================
> --- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2009-11-02 17:24:06 UTC (rev 24253)
> +++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c 2009-11-02 17:25:15 UTC (rev 24254)
> @@ -389,7 +389,7 @@
>
> 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 @@
> 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;
>
>
> Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
> ===================================================================
> --- trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2009-11-02 17:24:06 UTC (rev 24253)
> +++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2009-11-02 17:25:15 UTC (rev 24254)
> @@ -1447,7 +1447,7 @@
>
> /* 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 */
>
> Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
> ===================================================================
> --- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2009-11-02 17:24:06 UTC (rev 24253)
> +++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2009-11-02 17:25:15 UTC (rev 24254)
> @@ -1886,7 +1886,7 @@
> /* 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. */
>
>
> Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
> ===================================================================
> --- trunk/blender/source/blender/makesrna/intern/rna_space.c 2009-11-02 17:24:06 UTC (rev 24253)
> +++ trunk/blender/source/blender/makesrna/intern/rna_space.c 2009-11-02 17:25:15 UTC (rev 24254)
> @@ -1001,7 +1001,7 @@
> 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);
>
> Modified: trunk/blender/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp
> ===================================================================
> --- trunk/blender/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp 2009-11-02 17:24:06 UTC (rev 24253)
> +++ trunk/blender/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp 2009-11-02 17:25:15 UTC (rev 24254)
> @@ -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 @@
> 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::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 =
>
> @@ Diff output truncated at 10240 characters. @@
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>
More information about the Bf-committers
mailing list