[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44214] branches/bmesh/blender: svn merge ^/trunk/blender -r44204:44213

Campbell Barton ideasman42 at gmail.com
Fri Feb 17 22:07:28 CET 2012


Revision: 44214
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44214
Author:   campbellbarton
Date:     2012-02-17 21:07:18 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r44204:44213

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

Modified Paths:
--------------
    branches/bmesh/blender/CMakeLists.txt
    branches/bmesh/blender/build_files/scons/config/freebsd7-config.py
    branches/bmesh/blender/build_files/scons/config/freebsd8-config.py
    branches/bmesh/blender/build_files/scons/config/freebsd9-config.py
    branches/bmesh/blender/build_files/scons/tools/btools.py
    branches/bmesh/blender/doc/python_api/rst/info_gotcha.rst
    branches/bmesh/blender/extern/CMakeLists.txt
    branches/bmesh/blender/extern/SConscript
    branches/bmesh/blender/extern/libmv/third_party/glog/src/config_freebsd.h
    branches/bmesh/blender/extern/libmv/third_party/glog/src/utilities.h
    branches/bmesh/blender/intern/ghost/CMakeLists.txt
    branches/bmesh/blender/intern/ghost/SConscript
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_WindowX11.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_sound.h
    branches/bmesh/blender/source/blenderplayer/CMakeLists.txt
    branches/bmesh/blender/source/creator/CMakeLists.txt

Property Changed:
----------------
    branches/bmesh/blender/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152
/trunk/blender:39992-44204
   + /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152
/trunk/blender:39992-44213

Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt	2012-02-17 20:59:21 UTC (rev 44213)
+++ branches/bmesh/blender/CMakeLists.txt	2012-02-17 21:07:18 UTC (rev 44214)
@@ -160,6 +160,11 @@
 	option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
 	option(WITH_XDG_USER_DIRS    "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
 	mark_as_advanced(WITH_XDG_USER_DIRS)
+
+	# freebsd doesn't seems to support XDND
+	if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+		option(WITH_GHOST_XDND   "Enable drag'n'drop support on Linux using XDND protocol" ON)
+	endif()
 else()
 	# not an option for other OS's
 	set(WITH_BUILTIN_GLEW ON)

Modified: branches/bmesh/blender/build_files/scons/config/freebsd7-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/freebsd7-config.py	2012-02-17 20:59:21 UTC (rev 44213)
+++ branches/bmesh/blender/build_files/scons/config/freebsd7-config.py	2012-02-17 21:07:18 UTC (rev 44214)
@@ -164,6 +164,8 @@
 BF_EXPAT_LIB = 'expat'
 BF_EXPAT_LIBPATH = '${BF_EXPAT}/lib'
 
+WITH_GHOST_XDND = False
+
 WITH_BF_OPENMP = True
 
 #Ray trace optimization

Modified: branches/bmesh/blender/build_files/scons/config/freebsd8-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/freebsd8-config.py	2012-02-17 20:59:21 UTC (rev 44213)
+++ branches/bmesh/blender/build_files/scons/config/freebsd8-config.py	2012-02-17 21:07:18 UTC (rev 44214)
@@ -166,6 +166,8 @@
 
 WITH_BF_OPENMP = True
 
+WITH_GHOST_XDND = False
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']

Modified: branches/bmesh/blender/build_files/scons/config/freebsd9-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/freebsd9-config.py	2012-02-17 20:59:21 UTC (rev 44213)
+++ branches/bmesh/blender/build_files/scons/config/freebsd9-config.py	2012-02-17 21:07:18 UTC (rev 44214)
@@ -166,6 +166,8 @@
 
 WITH_BF_OPENMP = True
 
+WITH_GHOST_XDND = False
+
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
 BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread']

Modified: branches/bmesh/blender/build_files/scons/tools/btools.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/btools.py	2012-02-17 20:59:21 UTC (rev 44213)
+++ branches/bmesh/blender/build_files/scons/tools/btools.py	2012-02-17 21:07:18 UTC (rev 44214)
@@ -138,6 +138,7 @@
             'WITH_BF_OPENMP', 'BF_OPENMP', 'BF_OPENMP_LIBPATH',
             'WITH_GHOST_COCOA',
             'WITH_GHOST_SDL',
+            'WITH_GHOST_XDND',
             'BF_GHOST_DEBUG',
             'USE_QTKIT',
             'BF_FANCY', 'BF_QUIET', 'BF_LINE_OVERWRITE',
@@ -567,7 +568,9 @@
         ('BF_BOOST_INC', 'Boost include path', ''),
         ('BF_BOOST_LIB', 'Boost library', ''),
         ('BF_BOOST_LIBPATH', 'Boost library path', ''),
-        ('BF_BOOST_LIB_STATIC', 'Boost static library', '')
+        ('BF_BOOST_LIB_STATIC', 'Boost static library', ''),
+
+        (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on Linux platforms using XDND protocol', True))
     ) # end of opts.AddOptions()
 
     return localopts

Modified: branches/bmesh/blender/doc/python_api/rst/info_gotcha.rst
===================================================================
--- branches/bmesh/blender/doc/python_api/rst/info_gotcha.rst	2012-02-17 20:59:21 UTC (rev 44213)
+++ branches/bmesh/blender/doc/python_api/rst/info_gotcha.rst	2012-02-17 21:07:18 UTC (rev 44214)
@@ -118,14 +118,6 @@
    bpy.ops.wm.redraw_timer(type='DRAW_WIN_SWAP', iterations=1)
 
 
-Matrix multiplication is wrong
-==============================
-
-Every so often users complain that Blenders matrix math is wrong, the confusion comes from mathutils matrices being column-major to match OpenGL and the rest of Blenders matrix operations and stored matrix data.
-
-This is different to **numpy** which is row-major which matches what you would expect when using conventional matrix math notation.
-
-
 I can't edit the mesh in edit-mode!
 ===================================
 

Modified: branches/bmesh/blender/extern/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/extern/CMakeLists.txt	2012-02-17 20:59:21 UTC (rev 44213)
+++ branches/bmesh/blender/extern/CMakeLists.txt	2012-02-17 21:07:18 UTC (rev 44214)
@@ -72,6 +72,8 @@
 	add_subdirectory(carve)
 endif()
 
-if(UNIX AND NOT APPLE)
-	add_subdirectory(xdnd)
+if(WITH_GHOST_XDND)
+	if(UNIX AND NOT APPLE)
+		add_subdirectory(xdnd)
+	endif()
 endif()

Modified: branches/bmesh/blender/extern/SConscript
===================================================================
--- branches/bmesh/blender/extern/SConscript	2012-02-17 20:59:21 UTC (rev 44213)
+++ branches/bmesh/blender/extern/SConscript	2012-02-17 21:07:18 UTC (rev 44214)
@@ -35,5 +35,7 @@
 if env['WITH_BF_CARVE']:
     SConscript(['carve/SConscript'])
 
-if env['OURPLATFORM'] in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'aix4', 'aix5'):
-    SConscript(['xdnd/SConscript'])
+if env['WITH_GHOST_XDND']:
+    # FreeBSD doesn't seems to support XDND protocol
+    if env['OURPLATFORM'] in ('linux', 'openbsd3', 'sunos5', 'aix4', 'aix5'):
+        SConscript(['xdnd/SConscript'])

Modified: branches/bmesh/blender/extern/libmv/third_party/glog/src/config_freebsd.h
===================================================================
--- branches/bmesh/blender/extern/libmv/third_party/glog/src/config_freebsd.h	2012-02-17 20:59:21 UTC (rev 44213)
+++ branches/bmesh/blender/extern/libmv/third_party/glog/src/config_freebsd.h	2012-02-17 21:07:18 UTC (rev 44214)
@@ -11,7 +11,7 @@
 #define HAVE_DLFCN_H 1
 
 /* Define to 1 if you have the <execinfo.h> header file. */
-#define HAVE_EXECINFO_H 1
+#undef HAVE_EXECINFO_H
 
 /* Define if you have the `fcntl' function */
 #define HAVE_FCNTL 1

Modified: branches/bmesh/blender/extern/libmv/third_party/glog/src/utilities.h
===================================================================
--- branches/bmesh/blender/extern/libmv/third_party/glog/src/utilities.h	2012-02-17 20:59:21 UTC (rev 44213)
+++ branches/bmesh/blender/extern/libmv/third_party/glog/src/utilities.h	2012-02-17 21:07:18 UTC (rev 44214)
@@ -101,7 +101,7 @@
 // correctly when GetStackTrace() is called with max_depth == 0.
 // Some code may do that.
 
-#if __MINGW32__
+#if defined(__MINGW32__) || defined(__FreeBSD__)
 # undef STACKTRACE_H
 #elif defined(HAVE_LIB_UNWIND)
 # define STACKTRACE_H "stacktrace_libunwind-inl.h"

Modified: branches/bmesh/blender/intern/ghost/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/ghost/CMakeLists.txt	2012-02-17 20:59:21 UTC (rev 44213)
+++ branches/bmesh/blender/intern/ghost/CMakeLists.txt	2012-02-17 21:07:18 UTC (rev 44214)
@@ -220,19 +220,27 @@
 		intern/GHOST_SystemX11.cpp
 		intern/GHOST_SystemPathsX11.cpp
 		intern/GHOST_WindowX11.cpp
-		intern/GHOST_DropTargetX11.cpp
 
 		intern/GHOST_DisplayManagerX11.h
 		intern/GHOST_SystemX11.h
 		intern/GHOST_SystemPathsX11.h
 		intern/GHOST_WindowX11.h
-		intern/GHOST_DropTargetX11.h
 	)
 
-	list(APPEND INC
-		../../extern/xdnd
-	)
+	if(WITH_GHOST_XDND)
+		add_definitions(-DWITH_XDND)
 
+		list(APPEND INC
+			../../extern/xdnd
+		)
+
+		list(APPEND SRC
+			intern/GHOST_DropTargetX11.cpp
+
+			intern/GHOST_DropTargetX11.h
+		)
+	endif()
+
 	if(X11_XF86keysym_INCLUDE_PATH)
 		add_definitions(-DWITH_XF86KEYSYM)
 		list(APPEND INC_SYS

Modified: branches/bmesh/blender/intern/ghost/SConscript
===================================================================
--- branches/bmesh/blender/intern/ghost/SConscript	2012-02-17 20:59:21 UTC (rev 44213)
+++ branches/bmesh/blender/intern/ghost/SConscript	2012-02-17 21:07:18 UTC (rev 44214)
@@ -42,7 +42,12 @@
     # defs += ['PREFIX=\\"/usr/local/\\"']  # XXX, make an option
     defs += ['WITH_X11_XINPUT']  # XXX, make an option
 
-    incs += ' #/extern/xdnd'
+    # freebsd doesn't seem to support XDND protocol
+    if env['WITH_GHOST_XDND'] and window_system not in ('freebsd7', 'freebsd8', 'freebsd9'):
+        incs += ' #/extern/xdnd'
+        defs += ['WITH_XDND']
+    else:
+        sources.remove('intern' + os.sep + 'GHOST_DropTargetX11.cpp')
 
 elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'):
     for f in pf:

Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2012-02-17 20:59:21 UTC (rev 44213)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp	2012-02-17 21:07:18 UTC (rev 44214)
@@ -42,12 +42,15 @@
 #include "GHOST_EventButton.h"
 #include "GHOST_EventWheel.h"
 #include "GHOST_DisplayManagerX11.h"
-#include "GHOST_DropTargetX11.h"
 #include "GHOST_EventDragnDrop.h"
 #ifdef WITH_INPUT_NDOF
 #include "GHOST_NDOFManagerX11.h"
 #endif
 
+#ifdef WITH_XDND
+#include "GHOST_DropTargetX11.h"
+#endif
+
 #include "GHOST_Debug.h"
 
 #include <X11/Xatom.h>
@@ -711,10 +714,14 @@
 					}
 				}
 			} else {

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list