[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38933] branches/soc-2011-salad: Merging trunk up to r38932.

Joerg Mueller nexyon at gmail.com
Tue Aug 2 14:16:00 CEST 2011


Revision: 38933
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38933
Author:   nexyon
Date:     2011-08-02 12:16:00 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
Merging trunk up to r38932.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38932

Modified Paths:
--------------
    branches/soc-2011-salad/CMakeLists.txt
    branches/soc-2011-salad/SConstruct
    branches/soc-2011-salad/build_files/cmake/macros.cmake
    branches/soc-2011-salad/build_files/scons/config/darwin-config.py
    branches/soc-2011-salad/build_files/scons/config/linux2-config.py
    branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-salad/build_files/scons/tools/btools.py
    branches/soc-2011-salad/intern/ghost/CMakeLists.txt
    branches/soc-2011-salad/intern/ghost/GHOST_C-api.h
    branches/soc-2011-salad/intern/ghost/GHOST_ISystem.h
    branches/soc-2011-salad/intern/ghost/GHOST_Types.h
    branches/soc-2011-salad/intern/ghost/SConscript
    branches/soc-2011-salad/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2011-salad/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
    branches/soc-2011-salad/intern/ghost/intern/GHOST_DropTargetWin32.cpp
    branches/soc-2011-salad/intern/ghost/intern/GHOST_DropTargetWin32.h
    branches/soc-2011-salad/intern/ghost/intern/GHOST_EventManager.cpp
    branches/soc-2011-salad/intern/ghost/intern/GHOST_EventNDOF.h
    branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManager.h
    branches/soc-2011-salad/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2011-salad/intern/ghost/intern/GHOST_System.h
    branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
    branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemPathsWin32.h
    branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2011-salad/intern/ghost/intern/GHOST_TaskbarWin32.h
    branches/soc-2011-salad/intern/ghost/intern/GHOST_WindowWin32.h
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2011-salad/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-salad/source/blender/blenkernel/BKE_global.h
    branches/soc-2011-salad/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2011-salad/source/blender/editors/interface/resources.c
    branches/soc-2011-salad/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2011-salad/source/blender/editors/space_image/image_intern.h
    branches/soc-2011-salad/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-salad/source/blender/editors/space_image/space_image.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2011-salad/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2011-salad/source/blender/editors/transform/transform.c
    branches/soc-2011-salad/source/blender/editors/transform/transform_ops.c
    branches/soc-2011-salad/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-salad/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_action.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-salad/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-salad/source/blender/python/intern/bpy_props.c
    branches/soc-2011-salad/source/blender/windowmanager/WM_types.h
    branches/soc-2011-salad/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-salad/source/blender/windowmanager/intern/wm_init_exit.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/blender/windowmanager/wm_event_types.h

Added Paths:
-----------
    branches/soc-2011-salad/build_files/cmake/Modules/FindSpacenav.cmake
    branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
    branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
    branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerWin32.cpp
    branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerWin32.h
    branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
    branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerX11.h

Property Changed:
----------------
    branches/soc-2011-salad/
    branches/soc-2011-salad/intern/audaspace/OpenAL/


Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620,38661-38662
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38846
/branches/soc-2011-tomato:36831-38900
/trunk/blender:36834-38898
   + /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36854,37548,37564,37602,37622,37848,38043,38064,38226,38231,38282,38620,38661-38662
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-38846
/branches/soc-2011-tomato:36831-38900
/trunk/blender:36834-38932

Modified: branches/soc-2011-salad/CMakeLists.txt
===================================================================
--- branches/soc-2011-salad/CMakeLists.txt	2011-08-02 12:09:24 UTC (rev 38932)
+++ branches/soc-2011-salad/CMakeLists.txt	2011-08-02 12:16:00 UTC (rev 38933)
@@ -182,6 +182,7 @@
 option(WITH_LIBMV         "Enable libmv structure from motion library" ON)
 
 # Misc
+option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
 option(WITH_RAYOPTIMIZATION	"Enable use of SIMD (SSE) optimizations for the raytracer" ON) 
 if(UNIX AND NOT APPLE)
 	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
@@ -456,6 +457,19 @@
 		endif()
 	endif()
 
+	if (WITH_INPUT_NDOF)
+		find_package(Spacenav)
+		if(NOT SPACENAV_FOUND)
+			set(WITH_INPUT_NDOF OFF)
+		endif()
+
+		# use generic names within blenders buildsystem.
+		if(SPACENAV_FOUND)
+			set(NDOF_INCLUDE_DIRS ${SPACENAV_INCLUDE_DIRS})
+			set(NDOF_LIBRARIES ${SPACENAV_LIBRARIES})
+		endif()
+	endif()
+
 	# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
 	set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
 
@@ -1033,6 +1047,10 @@
 		set(TIFF_LIBPATH ${TIFF}/lib)
 	endif()
 
+	if (WITH_INPUT_NDOF)
+		# linker needs "-weak_framework 3DconnexionClient"
+	endif()
+
 	set(EXETYPE MACOSX_BUNDLE)
 
 	set(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
@@ -1328,6 +1346,7 @@
 	info_cfg_option(WITH_OPENCOLLADA)
 	info_cfg_option(WITH_FFTW3)
 	info_cfg_option(WITH_INTERNATIONAL)
+	info_cfg_option(WITH_INPUT_NDOF)
 
 	info_cfg_text("Compiler Options:")
 	info_cfg_option(WITH_BUILDINFO)

Modified: branches/soc-2011-salad/SConstruct
===================================================================
--- branches/soc-2011-salad/SConstruct	2011-08-02 12:09:24 UTC (rev 38932)
+++ branches/soc-2011-salad/SConstruct	2011-08-02 12:16:00 UTC (rev 38933)
@@ -241,6 +241,7 @@
     target_env_defs['BF_BUILDINFO'] = False
     target_env_defs['BF_NO_ELBEEM'] = True
     target_env_defs['WITH_BF_PYTHON'] = False
+    target_env_defs['WITH_BF_3DMOUSE'] = False
     
     # Merge blenderlite, let command line to override
     for k,v in target_env_defs.iteritems():

Copied: branches/soc-2011-salad/build_files/cmake/Modules/FindSpacenav.cmake (from rev 38931, trunk/blender/build_files/cmake/Modules/FindSpacenav.cmake)
===================================================================
--- branches/soc-2011-salad/build_files/cmake/Modules/FindSpacenav.cmake	                        (rev 0)
+++ branches/soc-2011-salad/build_files/cmake/Modules/FindSpacenav.cmake	2011-08-02 12:16:00 UTC (rev 38933)
@@ -0,0 +1,70 @@
+# - Find Spacenav library
+# Find the native Spacenav includes and library
+# This module defines
+#  SPACENAV_INCLUDE_DIRS, where to find spnav.h, Set when
+#                        SPACENAV_INCLUDE_DIR is found.
+#  SPACENAV_LIBRARIES, libraries to link against to use Spacenav.
+#  SPACENAV_ROOT_DIR, The base directory to search for Spacenav.
+#                    This can also be an environment variable.
+#  SPACENAV_FOUND, If false, do not try to use Spacenav.
+#
+# also defined, but not for general use are
+#  SPACENAV_LIBRARY, where to find the Spacenav library.
+
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+
+# If SPACENAV_ROOT_DIR was defined in the environment, use it.
+IF(NOT SPACENAV_ROOT_DIR AND NOT $ENV{SPACENAV_ROOT_DIR} STREQUAL "")
+  SET(SPACENAV_ROOT_DIR $ENV{SPACENAV_ROOT_DIR})
+ENDIF()
+
+SET(_spacenav_SEARCH_DIRS
+  ${SPACENAV_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
+  /opt/csw # Blastwave
+)
+
+FIND_PATH(SPACENAV_INCLUDE_DIR
+  NAMES
+    spnav.h
+  HINTS
+    ${_spacenav_SEARCH_DIRS}
+  PATH_SUFFIXES
+    include
+)
+
+FIND_LIBRARY(SPACENAV_LIBRARY
+  NAMES
+    spnav
+  HINTS
+    ${_spacenav_SEARCH_DIRS}
+  PATH_SUFFIXES
+    lib64 lib
+  )
+
+# handle the QUIETLY and REQUIRED arguments and set SPACENAV_FOUND to TRUE if 
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Spacenav DEFAULT_MSG
+    SPACENAV_LIBRARY SPACENAV_INCLUDE_DIR)
+
+IF(SPACENAV_FOUND)
+  SET(SPACENAV_LIBRARIES ${SPACENAV_LIBRARY})
+  SET(SPACENAV_INCLUDE_DIRS ${SPACENAV_INCLUDE_DIR})
+ENDIF(SPACENAV_FOUND)
+
+MARK_AS_ADVANCED(
+  SPACENAV_INCLUDE_DIR
+  SPACENAV_LIBRARY
+)

Modified: branches/soc-2011-salad/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-salad/build_files/cmake/macros.cmake	2011-08-02 12:09:24 UTC (rev 38932)
+++ branches/soc-2011-salad/build_files/cmake/macros.cmake	2011-08-02 12:16:00 UTC (rev 38933)
@@ -314,6 +314,10 @@
 	if(WITH_MEM_JEMALLOC)
 		target_link_libraries(${target} ${JEMALLOC_LIBRARIES})
 	endif()
+	if(WITH_INPUT_NDOF)
+		target_link_libraries(${target} ${NDOF_LIBRARIES})
+	endif()
+
 	if(WIN32 AND NOT UNIX)
 		target_link_libraries(${target} ${PTHREADS_LIBRARIES})
 	endif()

Modified: branches/soc-2011-salad/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/darwin-config.py	2011-08-02 12:09:24 UTC (rev 38932)
+++ branches/soc-2011-salad/build_files/scons/config/darwin-config.py	2011-08-02 12:16:00 UTC (rev 38933)
@@ -264,10 +264,12 @@
     BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse']
 elif MACOSX_ARCHITECTURE == 'x86_64':
     BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2']
-    
 #On-Surface Brush
 WITH_BF_ONSURFACEBRUSH = True
 
+# SpaceNavigator and related 3D mice
+WITH_BF_3DMOUSE = True
+
 #############################################################################
 ###################  various compile settings and flags    ##################
 #############################################################################
@@ -296,6 +298,9 @@
 	else:
 		PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
 
+if WITH_BF_3DMOUSE:
+	PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS + ['-weak_framework','3DconnexionClient']
+
 #note to build succesfully on 10.3.9 SDK you need to patch  10.3.9 by adding the SystemStubs.a lib from 10.4
 LLIBS = ['stdc++', 'SystemStubs']
 

Modified: branches/soc-2011-salad/build_files/scons/config/linux2-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/linux2-config.py	2011-08-02 12:09:24 UTC (rev 38932)
+++ branches/soc-2011-salad/build_files/scons/config/linux2-config.py	2011-08-02 12:16:00 UTC (rev 38933)
@@ -195,6 +195,10 @@
 #On-Surface Brush
 WITH_BF_ONSURFACEBRUSH = True
 
+#SpaceNavigator and friends
+WITH_BF_3DMOUSE = True
+BF_3DMOUSE_LIB = 'spnav'
+
 ##
 CC = 'gcc'
 CXX = 'g++'
@@ -226,6 +230,8 @@
 ##FIX_STUBS_WARNINGS = -Wno-unused
 
 LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']
+if WITH_BF_3DMOUSE:
+	LLIBS = LLIBS + [BF_3DMOUSE_LIB];
 ##LOPTS = --dynamic
 ##DYNLDFLAGS = -shared $(LDFLAGS)
 

Modified: branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py	2011-08-02 12:09:24 UTC (rev 38932)
+++ branches/soc-2011-salad/build_files/scons/config/win32-vc-config.py	2011-08-02 12:16:00 UTC (rev 38933)
@@ -149,6 +149,8 @@
 BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa UTF'
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
+WITH_BF_3DMOUSE = True
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE']

Modified: branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py	2011-08-02 12:09:24 UTC (rev 38932)
+++ branches/soc-2011-salad/build_files/scons/config/win64-vc-config.py	2011-08-02 12:16:00 UTC (rev 38933)
@@ -153,6 +153,8 @@
 BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa UTF'
 BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
 
+WITH_BF_3DMOUSE = True
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['/arch:SSE','/arch:SSE2']

Modified: branches/soc-2011-salad/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/tools/btools.py	2011-08-02 12:09:24 UTC (rev 38932)
+++ branches/soc-2011-salad/build_files/scons/tools/btools.py	2011-08-02 12:16:00 UTC (rev 38933)
@@ -137,7 +137,7 @@
             'BF_NO_ELBEEM',
             'WITH_BF_CXX_GUARDEDALLOC',

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list