[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40196] branches/soc-2011-radish: svn merge -r40179:40195 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Campbell Barton
ideasman42 at gmail.com
Wed Sep 14 03:33:03 CEST 2011
Revision: 40196
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40196
Author: campbellbarton
Date: 2011-09-14 01:32:59 +0000 (Wed, 14 Sep 2011)
Log Message:
-----------
svn merge -r40179:40195 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40179
Modified Paths:
--------------
branches/soc-2011-radish/build_files/buildbot/config/user-config-i686.py
branches/soc-2011-radish/build_files/buildbot/config/user-config-x86_64.py
branches/soc-2011-radish/build_files/cmake/Modules/FindOpenCOLLADA.cmake
branches/soc-2011-radish/build_files/cmake/Modules/FindPCRE.cmake
branches/soc-2011-radish/build_files/cmake/Modules/FindXML2.cmake
branches/soc-2011-radish/extern/recastnavigation/Detour/Include/DetourTileNavMesh.h
branches/soc-2011-radish/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
branches/soc-2011-radish/source/blender/blenkernel/BKE_curve.h
branches/soc-2011-radish/source/blender/blenkernel/BKE_object.h
branches/soc-2011-radish/source/blender/blenkernel/BKE_paint.h
branches/soc-2011-radish/source/blender/blenkernel/CMakeLists.txt
branches/soc-2011-radish/source/blender/blenkernel/SConscript
branches/soc-2011-radish/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-radish/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-radish/source/blender/blenkernel/intern/curve.c
branches/soc-2011-radish/source/blender/blenkernel/intern/displist.c
branches/soc-2011-radish/source/blender/blenkernel/intern/mesh_validate.c
branches/soc-2011-radish/source/blender/blenkernel/intern/navmesh_conversion.cpp
branches/soc-2011-radish/source/blender/blenkernel/intern/object.c
branches/soc-2011-radish/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-radish/source/blender/editors/curve/curve_ops.c
branches/soc-2011-radish/source/blender/editors/curve/editcurve.c
branches/soc-2011-radish/source/blender/editors/include/ED_curve.h
branches/soc-2011-radish/source/blender/editors/include/ED_sculpt.h
branches/soc-2011-radish/source/blender/editors/object/object_add.c
branches/soc-2011-radish/source/blender/editors/object/object_hook.c
branches/soc-2011-radish/source/blender/editors/object/object_relations.c
branches/soc-2011-radish/source/blender/editors/render/render_shading.c
branches/soc-2011-radish/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-radish/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/soc-2011-radish/source/blender/editors/sculpt_paint/sculpt_undo.c
branches/soc-2011-radish/source/blender/editors/space_info/info_stats.c
branches/soc-2011-radish/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2011-radish/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2011-radish/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-radish/source/blender/editors/transform/transform_generics.c
branches/soc-2011-radish/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-radish/source/blender/editors/transform/transform_orientations.c
branches/soc-2011-radish/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-radish/source/creator/CMakeLists.txt
Property Changed:
----------------
branches/soc-2011-radish/
branches/soc-2011-radish/intern/audaspace/OpenAL/
branches/soc-2011-radish/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-radish
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:40001-40179
+ /trunk/blender:40001-40195
Modified: branches/soc-2011-radish/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/soc-2011-radish/build_files/buildbot/config/user-config-i686.py 2011-09-14 01:23:17 UTC (rev 40195)
+++ branches/soc-2011-radish/build_files/buildbot/config/user-config-i686.py 2011-09-14 01:32:59 UTC (rev 40196)
@@ -87,6 +87,10 @@
BF_3DMOUSE = '/home/sources/staticlibs/spnav'
BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib32'
+# FFT
+WITH_BF_FFTW3 = True
+WITH_BF_STATICFFTW3 = True
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: branches/soc-2011-radish/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/soc-2011-radish/build_files/buildbot/config/user-config-x86_64.py 2011-09-14 01:23:17 UTC (rev 40195)
+++ branches/soc-2011-radish/build_files/buildbot/config/user-config-x86_64.py 2011-09-14 01:32:59 UTC (rev 40196)
@@ -87,6 +87,10 @@
BF_3DMOUSE = '/home/sources/staticlibs/spnav'
BF_3DMOUSE_LIBPATH = '${BF_3DMOUSE}/lib64'
+# FFT
+WITH_BF_FFTW3 = True
+WITH_BF_STATICFFTW3 = True
+
# Compilation and optimization
BF_DEBUG = False
REL_CFLAGS = ['-O2']
Modified: branches/soc-2011-radish/build_files/cmake/Modules/FindOpenCOLLADA.cmake
===================================================================
--- branches/soc-2011-radish/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2011-09-14 01:23:17 UTC (rev 40195)
+++ branches/soc-2011-radish/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2011-09-14 01:32:59 UTC (rev 40196)
@@ -119,8 +119,8 @@
# Ubuntu ppa needs this.
lib64/opencollada lib/opencollada
)
+ MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
IF(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
- MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
LIST(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}")
ENDIF()
ENDFOREACH()
Modified: branches/soc-2011-radish/build_files/cmake/Modules/FindPCRE.cmake
===================================================================
--- branches/soc-2011-radish/build_files/cmake/Modules/FindPCRE.cmake 2011-09-14 01:23:17 UTC (rev 40195)
+++ branches/soc-2011-radish/build_files/cmake/Modules/FindPCRE.cmake 2011-09-14 01:32:59 UTC (rev 40196)
@@ -1,43 +1,69 @@
-# - Try to find the PCRE regular expression library
-# Once done this will define
+# - Find PCRE library
+# Find the native PCRE includes and library
+# This module defines
+# PCRE_INCLUDE_DIRS, where to find pcre.h, Set when
+# PCRE_INCLUDE_DIR is found.
+# PCRE_LIBRARIES, libraries to link against to use PCRE.
+# PCRE_ROOT_DIR, The base directory to search for PCRE.
+# This can also be an environment variable.
+# PCRE_FOUND, If false, do not try to use PCRE.
#
-# PCRE_FOUND - system has the PCRE library
-# PCRE_INCLUDE_DIR - the PCRE include directory
-# PCRE_LIBRARIES - The libraries needed to use PCRE
+# also defined, but not for general use are
+# PCRE_LIBRARY, where to find the PCRE library.
-# Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
+#=============================================================================
+# Copyright 2011 Blender Foundation.
#
-# Redistribution and use is allowed according to the terms of the BSD license.
+# 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 (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
- # Already in cache, be silent
- set(PCRE_FIND_QUIETLY TRUE)
-endif (PCRE_INCLUDE_DIR AND PCRE_PCREPOSIX_LIBRARY AND PCRE_PCRE_LIBRARY)
-
-if (NOT WIN32)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- find_package(PkgConfig)
- pkg_check_modules(PC_PCRE QUIET libpcre)
- set(PCRE_DEFINITIONS ${PC_PCRE_CFLAGS_OTHER})
-endif (NOT WIN32)
+# If PCRE_ROOT_DIR was defined in the environment, use it.
+IF(NOT PCRE_ROOT_DIR AND NOT $ENV{PCRE_ROOT_DIR} STREQUAL "")
+ SET(PCRE_ROOT_DIR $ENV{PCRE_ROOT_DIR})
+ENDIF()
-find_path(PCRE_INCLUDE_DIR pcre.h
- HINTS ${PC_PCRE_INCLUDEDIR} ${PC_PCRE_INCLUDE_DIRS}
- PATH_SUFFIXES pcre)
+SET(_pcre_SEARCH_DIRS
+ ${PCRE_ROOT_DIR}
+ /usr/local
+ /sw # Fink
+ /opt/local # DarwinPorts
+ /opt/csw # Blastwave
+)
-find_library(PCRE_PCRE_LIBRARY NAMES pcre HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS})
+FIND_PATH(PCRE_INCLUDE_DIR pcre.h
+ HINTS
+ ${_pcre_SEARCH_DIRS}
+ PATH_SUFFIXES
+ include
+ include
+)
-find_library(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS})
+FIND_LIBRARY(PCRE_LIBRARY
+ NAMES
+ pcre
+ HINTS
+ ${_pcre_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
+ )
-include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set PCRE_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(PCRE DEFAULT_MSG
+ PCRE_LIBRARY PCRE_INCLUDE_DIR)
-IF(NOT WIN32)
- find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY PCRE_PCREPOSIX_LIBRARY )
- mark_as_advanced(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCREPOSIX_LIBRARY PCRE_PCRE_LIBRARY)
- set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} ${PCRE_PCREPOSIX_LIBRARY})
-ELSE()
- find_package_handle_standard_args(PCRE DEFAULT_MSG PCRE_INCLUDE_DIR PCRE_PCRE_LIBRARY )
- set(PCRE_LIBRARIES ${PCRE_PCRE_LIBRARY} )
- mark_as_advanced(PCRE_INCLUDE_DIR PCRE_LIBRARIES PCRE_PCRE_LIBRARY)
-ENDIF()
+IF(PCRE_FOUND)
+ SET(PCRE_LIBRARIES ${PCRE_LIBRARY})
+ SET(PCRE_INCLUDE_DIRS ${PCRE_INCLUDE_DIR})
+ENDIF(PCRE_FOUND)
+
+MARK_AS_ADVANCED(
+ PCRE_INCLUDE_DIR
+ PCRE_LIBRARY
+)
Modified: branches/soc-2011-radish/build_files/cmake/Modules/FindXML2.cmake
===================================================================
--- branches/soc-2011-radish/build_files/cmake/Modules/FindXML2.cmake 2011-09-14 01:23:17 UTC (rev 40195)
+++ branches/soc-2011-radish/build_files/cmake/Modules/FindXML2.cmake 2011-09-14 01:32:59 UTC (rev 40196)
@@ -1,88 +1,68 @@
-# - Try to find XML2
-# Once done this will define
+# - Find XML2 library
+# Find the native XML2 includes and library
+# This module defines
+# XML2_INCLUDE_DIRS, where to find xml2.h, Set when
+# XML2_INCLUDE_DIR is found.
+# XML2_LIBRARIES, libraries to link against to use XML2.
+# XML2_ROOT_DIR, The base directory to search for XML2.
+# This can also be an environment variable.
+# XML2_FOUND, If false, do not try to use XML2.
#
-# XML2_FOUND - system has XML2
-# XML2_INCLUDE_DIRS - the XML2 include directory
-# XML2_LIBRARIES - Link these to use XML2
-# XML2_DEFINITIONS - Compiler switches required for using XML2
+# also defined, but not for general use are
+# XML2_LIBRARY, where to find the XML2 library.
+
+#=============================================================================
+# Copyright 2011 Blender Foundation.
#
-# Copyright (c) 2008 Andreas Schneider <mail at cynapses.org>
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
#
-# Redistribution and use is allowed according to the terms of the New
-# BSD license.
-#
+# 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 XML2_ROOT_DIR was defined in the environment, use it.
+IF(NOT XML2_ROOT_DIR AND NOT $ENV{XML2_ROOT_DIR} STREQUAL "")
+ SET(XML2_ROOT_DIR $ENV{XML2_ROOT_DIR})
+ENDIF()
-if (XML2_LIBRARIES AND XML2_INCLUDE_DIRS)
- # in cache already
- set(XML2_FOUND TRUE)
-else (XML2_LIBRARIES AND XML2_INCLUDE_DIRS)
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- if (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
- include(UsePkgConfig)
- pkgconfig(libxml-2.0 _XML2_INCLUDEDIR _XML2_LIBDIR _XML2_LDFLAGS _XML2_CFLAGS)
- else (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
- find_package(PkgConfig)
- if (PKG_CONFIG_FOUND)
- pkg_check_modules(_XML2 libxml-2.0)
- endif (PKG_CONFIG_FOUND)
- endif (${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4)
- find_path(XML2_INCLUDE_DIR
- NAMES
- libxml/xpath.h
- PATHS
- ${_XML2_INCLUDEDIR}
- /usr/include
- /usr/local/include
- /opt/local/include
- /sw/include
- PATH_SUFFIXES
- libxml2
- )
+SET(_xml2_SEARCH_DIRS
+ ${XML2_ROOT_DIR}
+ /usr/local
+ /sw # Fink
+ /opt/local # DarwinPorts
+ /opt/csw # Blastwave
+)
- find_library(XML2_LIBRARY
- NAMES
- xml2
- PATHS
- ${_XML2_LIBDIR}
- /usr/lib
- /usr/local/lib
- /opt/local/lib
- /sw/lib
- )
+FIND_PATH(XML2_INCLUDE_DIR libxml2/libxml/xpath.h
+ HINTS
+ ${_xml2_SEARCH_DIRS}
+ PATH_SUFFIXES
+ include
+)
- if (XML2_LIBRARY)
- set(XML2_FOUND TRUE)
- endif (XML2_LIBRARY)
-
- set(XML2_INCLUDE_DIRS
- ${XML2_INCLUDE_DIR}
+FIND_LIBRARY(XML2_LIBRARY
+ NAMES
+ xml2
+ HINTS
+ ${_xml2_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
)
- if (XML2_FOUND)
- set(XML2_LIBRARIES
- ${XML2_LIBRARIES}
- ${XML2_LIBRARY}
- )
- endif (XML2_FOUND)
+# handle the QUIETLY and REQUIRED arguments and set XML2_FOUND to TRUE if
+# all listed variables are TRUE
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(XML2 DEFAULT_MSG
+ XML2_LIBRARY XML2_INCLUDE_DIR)
- if (XML2_INCLUDE_DIRS AND XML2_LIBRARIES)
- set(XML2_FOUND TRUE)
- endif (XML2_INCLUDE_DIRS AND XML2_LIBRARIES)
+IF(XML2_FOUND)
+ SET(XML2_LIBRARIES ${XML2_LIBRARY})
+ SET(XML2_INCLUDE_DIRS ${XML2_INCLUDE_DIR})
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list