Revision: 37209
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37209
Author: jwilkins
Date: 2011-06-05 13:59:04 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
Merged with trunk: 37150-37206 (command line and output follows)
D:\gsoc\soc-2011-salad>svn merge
^https://svn.blender.org/svnroot/bf-blender/trunk/blender@37206
--non-interactive
--- Merging r37150 through r37206 into '.':
...
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37150
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37206
Modified Paths:
--------------
branches/soc-2011-salad/CMakeLists.txt
branches/soc-2011-salad/doc/manpage/blender.1
branches/soc-2011-salad/intern/ghost/CMakeLists.txt
branches/soc-2011-salad/intern/ghost/intern/GHOST_ISystem.cpp
branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-salad/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-salad/source/blender/blenkernel/intern/blender.c
branches/soc-2011-salad/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2011-salad/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-salad/source/blender/blenlib/intern/path_util.c
branches/soc-2011-salad/source/blender/blenloader/intern/readfile.c
branches/soc-2011-salad/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/include/ED_particle.h
branches/soc-2011-salad/source/blender/editors/include/ED_screen.h
branches/soc-2011-salad/source/blender/editors/include/ED_types.h
branches/soc-2011-salad/source/blender/editors/include/ED_util.h
branches/soc-2011-salad/source/blender/editors/include/UI_interface.h
branches/soc-2011-salad/source/blender/editors/interface/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/interface/interface.c
branches/soc-2011-salad/source/blender/editors/interface/interface_draw.c
branches/soc-2011-salad/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-salad/source/blender/editors/interface/interface_icons.c
branches/soc-2011-salad/source/blender/editors/interface/interface_intern.h
branches/soc-2011-salad/source/blender/editors/interface/interface_panel.c
branches/soc-2011-salad/source/blender/editors/interface/interface_regions.c
branches/soc-2011-salad/source/blender/editors/interface/interface_templates.c
branches/soc-2011-salad/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-salad/source/blender/editors/interface/resources.c
branches/soc-2011-salad/source/blender/editors/object/object_add.c
branches/soc-2011-salad/source/blender/editors/physics/particle_edit.c
branches/soc-2011-salad/source/blender/editors/screen/area.c
branches/soc-2011-salad/source/blender/editors/screen/screen_edit.c
branches/soc-2011-salad/source/blender/editors/screen/screen_ops.c
branches/soc-2011-salad/source/blender/editors/space_action/space_action.c
branches/soc-2011-salad/source/blender/editors/space_api/spacetypes.c
branches/soc-2011-salad/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2011-salad/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/space_file/file_draw.c
branches/soc-2011-salad/source/blender/editors/space_file/file_intern.h
branches/soc-2011-salad/source/blender/editors/space_file/filelist.c
branches/soc-2011-salad/source/blender/editors/space_script/script_header.c
branches/soc-2011-salad/source/blender/editors/space_sound/sound_header.c
branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-salad/source/blender/editors/util/editmode_undo.c
branches/soc-2011-salad/source/blender/editors/util/undo.c
branches/soc-2011-salad/source/blender/editors/util/util_intern.h
branches/soc-2011-salad/source/blender/imbuf/intern/targa.c
branches/soc-2011-salad/source/blender/makesdna/DNA_screen_types.h
branches/soc-2011-salad/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-salad/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-salad/source/blender/modifiers/CMakeLists.txt
branches/soc-2011-salad/source/blender/modifiers/intern/MOD_none.c
branches/soc-2011-salad/source/blender/python/intern/bpy_driver.c
branches/soc-2011-salad/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-salad/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2011-salad/source/creator/CMakeLists.txt
branches/soc-2011-salad/source/creator/creator.c
Added Paths:
-----------
branches/soc-2011-salad/intern/ghost/intern/GHOST_DisplayManagerNULL.h
branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemNULL.h
branches/soc-2011-salad/intern/ghost/intern/GHOST_WindowNULL.h
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-pepper:36830-37151
/trunk/blender:36834-37149
+ /branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-pepper:36830-37151
/trunk/blender:36834-37206
Modified: branches/soc-2011-salad/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/CMakeLists.txt 2011-06-05 13:44:55 UTC (rev
37208)
+++ branches/soc-2011-salad/CMakeLists.txt 2011-06-05 13:59:04 UTC (rev
37209)
@@ -98,6 +98,10 @@
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
+
+option(WITH_HEADLESS "Build without graphical support (renderfarm, server
mode only)" OFF)
+mark_as_advanced(WITH_HEADLESS)
+
# (unix defaults to OpenMP On)
if(UNIX AND NOT APPLE)
option(WITH_OPENMP "Enable OpenMP (has to be supported by the
compiler)" ON)
@@ -205,6 +209,11 @@
message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to
be OFF")
endif()
+# may as well build python module without a UI
+if(WITH_PYTHON_MODULE)
+ set(WITH_HEADLESS ON)
+endif()
+
# remove old vars
unset(WITH_INSTALL CACHE)
@@ -409,15 +418,19 @@
unset(JEMALLOC)
endif()
- find_package(X11 REQUIRED)
- find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h
${X11_INC_SEARCH_PATH})
- mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
-
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using
--as-needed
- set(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB}")
+ set(LLIBS "-lutil -lc -lm -lpthread -lstdc++")
- if(WITH_X11_XINPUT)
- list(APPEND LLIBS ${X11_Xinput_LIB})
+ if(NOT WITH_HEADLESS)
+ find_package(X11 REQUIRED)
+ find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h
${X11_INC_SEARCH_PATH})
+ mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
+
+ list(APPEND LLIBS ${X11_X11_LIB})
+
+ if(WITH_X11_XINPUT)
+ list(APPEND LLIBS ${X11_Xinput_LIB})
+ endif()
endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
Modified: branches/soc-2011-salad/doc/manpage/blender.1
===================================================================
(Binary files differ)
Modified: branches/soc-2011-salad/intern/ghost/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/intern/ghost/CMakeLists.txt 2011-06-05 13:44:55 UTC
(rev 37208)
+++ branches/soc-2011-salad/intern/ghost/CMakeLists.txt 2011-06-05 13:59:04 UTC
(rev 37209)
@@ -89,7 +89,42 @@
intern/GHOST_WindowManager.h
)
-if(APPLE)
+if(WITH_HEADLESS)
+ list(APPEND SRC
+ intern/GHOST_DisplayManagerNULL.h
+ intern/GHOST_SystemNULL.h
+ intern/GHOST_WindowNULL.h
+ )
+ add_definitions(-DWITH_HEADLESS)
+
+ # ack, this is still system dependant
+ if(APPLE)
+ if(WITH_COCOA)
+ list(APPEND SRC
+ intern/GHOST_SystemPathsCocoa.mm
+ intern/GHOST_SystemPathsCocoa.h
+ )
+ else()
+ list(APPEND SRC
+ intern/GHOST_SystemPathsCarbon.cpp
+ intern/GHOST_SystemPathsCarbon.h
+ )
+ endif()
+ elseif(UNIX)
+ list(APPEND SRC
+ intern/GHOST_SystemPathsX11.cpp
+ intern/GHOST_SystemPathsX11.h
+ )
+ elseif(WIN32)
+
+ list(APPEND SRC
+ intern/GHOST_SystemPathsWin32.cpp
+
+ intern/GHOST_SystemPathsWin32.h
+ )
+ endif()
+
+elseif(APPLE)
if(WITH_COCOA)
list(APPEND SRC
intern/GHOST_DisplayManagerCocoa.mm
Copied: branches/soc-2011-salad/intern/ghost/intern/GHOST_DisplayManagerNULL.h
(from rev 37206, trunk/blender/intern/ghost/intern/GHOST_DisplayManagerNULL.h)
===================================================================
--- branches/soc-2011-salad/intern/ghost/intern/GHOST_DisplayManagerNULL.h
(rev 0)
+++ branches/soc-2011-salad/intern/ghost/intern/GHOST_DisplayManagerNULL.h
2011-06-05 13:59:04 UTC (rev 37209)
@@ -0,0 +1,51 @@
+/*
+ * $Id$
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file ghost/intern/GHOST_DisplayManagerNULL.h
+ * \ingroup GHOST
+ * Declaration of GHOST_DisplayManagerNULL class.
+ */
+
+#ifndef _GHOST_DISPLAY_MANAGER_NULL_H_
+#define _GHOST_DISPLAY_MANAGER_NULL_H_
+
+#include "GHOST_DisplayManager.h"
+#include "GHOST_SystemNULL.h"
+
+class GHOST_SystemNULL;
+
+class GHOST_DisplayManagerNULL : public GHOST_DisplayManager
+{
+public:
+ GHOST_DisplayManagerNULL( GHOST_SystemNULL *system ) :
GHOST_DisplayManager(), m_system(system) { /* nop */ }
+ GHOST_TSuccess getNumDisplays( GHOST_TUns8& numDisplays ) const {
return GHOST_kFailure; }
+ GHOST_TSuccess getNumDisplaySettings( GHOST_TUns8 display,
GHOST_TInt32& numSettings ) const{ return GHOST_kFailure; }
+ GHOST_TSuccess getDisplaySetting( GHOST_TUns8 display, GHOST_TInt32
index, GHOST_DisplaySetting& setting ) const { return GHOST_kFailure; }
+ GHOST_TSuccess getCurrentDisplaySetting( GHOST_TUns8 display,
GHOST_DisplaySetting& setting ) const { return
getDisplaySetting(display,GHOST_TInt32(0),setting); }
+ GHOST_TSuccess setCurrentDisplaySetting( GHOST_TUns8 display, const
GHOST_DisplaySetting& setting ){ return GHOST_kSuccess; }
+
+private :
+ GHOST_SystemNULL * m_system;
+};
+
+#endif /* _GHOST_DISPLAY_MANAGER_NULL_H_ */
Modified: branches/soc-2011-salad/intern/ghost/intern/GHOST_ISystem.cpp
===================================================================
--- branches/soc-2011-salad/intern/ghost/intern/GHOST_ISystem.cpp
2011-06-05 13:44:55 UTC (rev 37208)
+++ branches/soc-2011-salad/intern/ghost/intern/GHOST_ISystem.cpp
2011-06-05 13:59:04 UTC (rev 37209)
@@ -41,7 +41,9 @@
#include "GHOST_ISystem.h"
-#ifdef WIN32
+#ifdef WITH_HEADLESS
+# include "GHOST_SystemNULL.h"
+#elif defined(WIN32)
# include "GHOST_SystemWin32.h"
#else
# ifdef __APPLE__
@@ -63,7 +65,9 @@
{
GHOST_TSuccess success;
if (!m_system) {
-#ifdef WIN32
+#ifdef WITH_HEADLESS
+ m_system = new GHOST_SystemNULL();
+#elif defined(WIN32)
m_system = new GHOST_SystemWin32 ();
#else
# ifdef __APPLE__
Modified: branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManager.cpp
===================================================================
--- branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManager.cpp
2011-06-05 13:44:55 UTC (rev 37208)
+++ branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManager.cpp
2011-06-05 13:59:04 UTC (rev 37209)
@@ -81,7 +81,9 @@
#if 0
printf("%i client \n", Pid);
#endif
- #if defined(_WIN32) || defined(__APPLE__)
+ #if defined(WITH_HEADLESS)
+ /* do nothing */
+ #elif defined(_WIN32) || defined(__APPLE__)
m_DeviceHandle = ndofDeviceOpen((void
*)¤tNdofValues);
#else
GHOST_SystemX11 *sys;
Copied: branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemNULL.h (from
rev 37206, trunk/blender/intern/ghost/intern/GHOST_SystemNULL.h)
===================================================================
--- branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemNULL.h
(rev 0)
+++ branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemNULL.h
2011-06-05 13:59:04 UTC (rev 37209)
@@ -0,0 +1,93 @@
+/*
+ * $Id$
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * Contributor(s): Campbell Barton
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/** \file ghost/intern/GHOST_SystemNULL.h
+ * \ingroup GHOST
+ * Declaration of GHOST_SystemNULL class.
+ */
+
+#ifndef _GHOST_SYSTEM_NULL_H_
+#define _GHOST_SYSTEM_NULL_H_
+
+#include "GHOST_System.h"
+#include "../GHOST_Types.h"
+#include "GHOST_DisplayManagerNULL.h"
+#include "GHOST_WindowNULL.h"
+
+class GHOST_WindowNULL;
+
+class GHOST_SystemNULL : public GHOST_System {
+public:
+
+ GHOST_SystemNULL( ) : GHOST_System() { /* nop */ }
+ ~GHOST_SystemNULL() { /* nop */ }
+ bool processEvents(bool waitForEvent) { return false; }
+ int toggleConsole(int action) { return 0; }
+ GHOST_TSuccess getModifierKeys(GHOST_ModifierKeys& keys) const { return
GHOST_kSuccess; }
+ GHOST_TSuccess getButtons(GHOST_Buttons& buttons) const { return
GHOST_kSuccess; }
+ GHOST_TUns8 *getClipboard(bool selection) const { return NULL; }
+ void putClipboard(GHOST_TInt8 *buffer, bool selection) const { /* nop
*/ }
+ GHOST_TUns64 getMilliSeconds( ) const { return 0; }
+ GHOST_TUns8 getNumDisplays( ) const { return GHOST_TUns8(1); }
+ GHOST_TSuccess getCursorPosition( GHOST_TInt32& x, GHOST_TInt32& y )
const { return GHOST_kFailure; }
+ GHOST_TSuccess setCursorPosition( GHOST_TInt32 x, GHOST_TInt32 y ) {
return GHOST_kFailure; }
+ void getMainDisplayDimensions( GHOST_TUns32& width, GHOST_TUns32&
height ) const { /* nop */ }
+
+ GHOST_TSuccess init() {
+ GHOST_TSuccess success = GHOST_System::init();
+
+ if (success) {
+ m_displayManager = new GHOST_DisplayManagerNULL(this);
+
+ if (m_displayManager) {
+ return GHOST_kSuccess;
+ }
+ }
+
+ return GHOST_kFailure;
+ }
+
+ GHOST_IWindow* createWindow(
+ const STR_String& title,
+ GHOST_TInt32 left,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
