[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36427] trunk/blender: x11 builds again.

Campbell Barton ideasman42 at gmail.com
Mon May 2 10:36:00 CEST 2011


Revision: 36427
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36427
Author:   campbellbarton
Date:     2011-05-02 08:36:00 +0000 (Mon, 02 May 2011)
Log Message:
-----------
x11 builds again.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
    trunk/blender/intern/ghost/intern/GHOST_SystemX11.h
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2011-05-02 08:07:24 UTC (rev 36426)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2011-05-02 08:36:00 UTC (rev 36427)
@@ -1492,3 +1492,9 @@
 }
 
 
+int GHOST_SystemX11::toggleConsole(int action)
+{
+	/* do nothing */
+	(void)action;
+	return 0;
+}

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.h	2011-05-02 08:07:24 UTC (rev 36426)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.h	2011-05-02 08:36:00 UTC (rev 36427)
@@ -227,6 +227,8 @@
 	 */
 	void putClipboard(GHOST_TInt8 *buffer, bool selection) const;
 
+	int toggleConsole(int action); /* dummy */
+
 	/**
 	 * Atom used for ICCCM, WM-spec and Motif.
 	 * We only need get this atom at the start, it's relative

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2011-05-02 08:07:24 UTC (rev 36426)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2011-05-02 08:36:00 UTC (rev 36427)
@@ -2030,7 +2030,7 @@
 
 /* *********************** */
 
-static int wm_console_toggle_op(bContext *C, wmOperator *UNUSED(op))
+static int wm_console_toggle_op(bContext *UNUSED(C), wmOperator *UNUSED(op))
 {
 	GHOST_toggleConsole(2);
 	return OPERATOR_FINISHED;




More information about the Bf-blender-cvs mailing list