[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40045] branches/soc-2011-tomato: Merging r39998 through r40043 from trunk into soc-2011-tomato
Sergey Sharybin
g.ulairi at gmail.com
Thu Sep 8 20:59:35 CEST 2011
Revision: 40045
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40045
Author: nazgul
Date: 2011-09-08 18:59:35 +0000 (Thu, 08 Sep 2011)
Log Message:
-----------
Merging r39998 through r40043 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39998
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40043
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/cmake/Modules/FindOpenCOLLADA.cmake
branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
branches/soc-2011-tomato/doc/python_api/examples/bge.texture.1.py
branches/soc-2011-tomato/doc/python_api/examples/bpy.types.Operator.py
branches/soc-2011-tomato/doc/python_api/rst/info_tips_and_tricks.rst
branches/soc-2011-tomato/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-tomato/intern/tools/credits_svn_gen.py
branches/soc-2011-tomato/intern/tools/pydna.py
branches/soc-2011-tomato/release/datafiles/blenderbuttons
branches/soc-2011-tomato/release/scripts/modules/bpy_types.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/animsys_update.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/nla.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_speaker.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/collada/ArmatureExporter.cpp
branches/soc-2011-tomato/source/blender/collada/ArmatureExporter.h
branches/soc-2011-tomato/source/blender/collada/CMakeLists.txt
branches/soc-2011-tomato/source/blender/collada/CameraExporter.cpp
branches/soc-2011-tomato/source/blender/collada/CameraExporter.h
branches/soc-2011-tomato/source/blender/collada/DocumentExporter.cpp
branches/soc-2011-tomato/source/blender/collada/DocumentExporter.h
branches/soc-2011-tomato/source/blender/collada/EffectExporter.cpp
branches/soc-2011-tomato/source/blender/collada/EffectExporter.h
branches/soc-2011-tomato/source/blender/collada/GeometryExporter.cpp
branches/soc-2011-tomato/source/blender/collada/GeometryExporter.h
branches/soc-2011-tomato/source/blender/collada/ImageExporter.cpp
branches/soc-2011-tomato/source/blender/collada/ImageExporter.h
branches/soc-2011-tomato/source/blender/collada/LightExporter.cpp
branches/soc-2011-tomato/source/blender/collada/LightExporter.h
branches/soc-2011-tomato/source/blender/collada/MaterialExporter.cpp
branches/soc-2011-tomato/source/blender/collada/MaterialExporter.h
branches/soc-2011-tomato/source/blender/collada/SceneExporter.cpp
branches/soc-2011-tomato/source/blender/collada/SceneExporter.h
branches/soc-2011-tomato/source/blender/collada/collada.cpp
branches/soc-2011-tomato/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2011-tomato/source/blender/python/generic/py_capi_utils.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_keymap.c
Added Paths:
-----------
branches/soc-2011-tomato/build_files/cmake/Modules/FindPCRE.cmake
branches/soc-2011-tomato/build_files/cmake/Modules/FindXML2.cmake
branches/soc-2011-tomato/source/blender/collada/ExportSettings.cpp
branches/soc-2011-tomato/source/blender/collada/ExportSettings.h
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-39997
+ /branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-40043
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2011-09-08 18:58:07 UTC (rev 40044)
+++ branches/soc-2011-tomato/CMakeLists.txt 2011-09-08 18:59:35 UTC (rev 40045)
@@ -455,15 +455,8 @@
if(WITH_OPENCOLLADA)
find_package(OpenCOLLADA)
if(OPENCOLLADA_FOUND)
- set(PCRE /usr CACHE PATH "PCRE Directory")
- mark_as_advanced(PCRE)
- set(PCRE_LIBPATH ${PCRE}/lib)
- set(PCRE_LIB pcre)
-
- set(EXPAT /usr CACHE PATH "Expat Directory")
- mark_as_advanced(EXPAT)
- set(EXPAT_LIBPATH ${EXPAT}/lib)
- set(EXPAT_LIB expat)
+ find_package(XML2)
+ find_package(PCRE)
else()
set(WITH_OPENCOLLADA OFF)
endif()
Modified: branches/soc-2011-tomato/build_files/cmake/Modules/FindOpenCOLLADA.cmake
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2011-09-08 18:58:07 UTC (rev 40044)
+++ branches/soc-2011-tomato/build_files/cmake/Modules/FindOpenCOLLADA.cmake 2011-09-08 18:59:35 UTC (rev 40045)
@@ -49,12 +49,14 @@
OpenCOLLADAFramework
OpenCOLLADABaseUtils
GeneratedSaxParser
+ MathMLSolver
+)
+
+# Fedora openCOLLADA package links these statically
+SET(_opencollada_FIND_STATIC_COMPONENTS
UTF
- MathMLSolver
- pcre
ftoa
buffer
- xml2
)
SET(_opencollada_SEARCH_DIRS
@@ -104,7 +106,26 @@
LIST(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}")
ENDFOREACH()
+FOREACH(COMPONENT ${_opencollada_FIND_STATIC_COMPONENTS})
+ STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
+ FIND_LIBRARY(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY
+ NAMES
+ ${COMPONENT}
+ HINTS
+ ${_opencollada_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
+ # Ubuntu ppa needs this.
+ lib64/opencollada lib/opencollada
+ )
+ IF(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
+ MARK_AS_ADVANCED(OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY)
+ LIST(APPEND _opencollada_LIBRARIES "${OPENCOLLADA_${UPPERCOMPONENT}_LIBRARY}")
+ ENDIF()
+ENDFOREACH()
+
+
# handle the QUIETLY and REQUIRED arguments and set OPENCOLLADA_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
Copied: branches/soc-2011-tomato/build_files/cmake/Modules/FindPCRE.cmake (from rev 40043, trunk/blender/build_files/cmake/Modules/FindPCRE.cmake)
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/Modules/FindPCRE.cmake (rev 0)
+++ branches/soc-2011-tomato/build_files/cmake/Modules/FindPCRE.cmake 2011-09-08 18:59:35 UTC (rev 40045)
@@ -0,0 +1,43 @@
+# - Try to find the PCRE regular expression library
+# Once done this will define
+#
+# PCRE_FOUND - system has the PCRE library
+# PCRE_INCLUDE_DIR - the PCRE include directory
+# PCRE_LIBRARIES - The libraries needed to use PCRE
+
+# Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+
+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)
+
+find_path(PCRE_INCLUDE_DIR pcre.h
+ HINTS ${PC_PCRE_INCLUDEDIR} ${PC_PCRE_INCLUDE_DIRS}
+ PATH_SUFFIXES pcre)
+
+find_library(PCRE_PCRE_LIBRARY NAMES pcre HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS})
+
+find_library(PCRE_PCREPOSIX_LIBRARY NAMES pcreposix HINTS ${PC_PCRE_LIBDIR} ${PC_PCRE_LIBRARY_DIRS})
+
+include(FindPackageHandleStandardArgs)
+
+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()
Copied: branches/soc-2011-tomato/build_files/cmake/Modules/FindXML2.cmake (from rev 40043, trunk/blender/build_files/cmake/Modules/FindXML2.cmake)
===================================================================
--- branches/soc-2011-tomato/build_files/cmake/Modules/FindXML2.cmake (rev 0)
+++ branches/soc-2011-tomato/build_files/cmake/Modules/FindXML2.cmake 2011-09-08 18:59:35 UTC (rev 40045)
@@ -0,0 +1,88 @@
+# - Try to find XML2
+# Once done this will define
+#
+# 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
+#
+# Copyright (c) 2008 Andreas Schneider <mail at cynapses.org>
+#
+# Redistribution and use is allowed according to the terms of the New
+# BSD license.
+#
+
+
+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
+ )
+
+ find_library(XML2_LIBRARY
+ NAMES
+ xml2
+ PATHS
+ ${_XML2_LIBDIR}
+ /usr/lib
+ /usr/local/lib
+ /opt/local/lib
+ /sw/lib
+ )
+
+ if (XML2_LIBRARY)
+ set(XML2_FOUND TRUE)
+ endif (XML2_LIBRARY)
+
+ set(XML2_INCLUDE_DIRS
+ ${XML2_INCLUDE_DIR}
+ )
+
+ if (XML2_FOUND)
+ set(XML2_LIBRARIES
+ ${XML2_LIBRARIES}
+ ${XML2_LIBRARY}
+ )
+ endif (XML2_FOUND)
+
+ if (XML2_INCLUDE_DIRS AND XML2_LIBRARIES)
+ set(XML2_FOUND TRUE)
+ endif (XML2_INCLUDE_DIRS AND XML2_LIBRARIES)
+
+ if (XML2_FOUND)
+ if (NOT XML2_FIND_QUIETLY)
+ message(STATUS "Found XML2: ${XML2_LIBRARIES}")
+ endif (NOT XML2_FIND_QUIETLY)
+ else (XML2_FOUND)
+ if (XML2_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find XML2")
+ endif (XML2_FIND_REQUIRED)
+ endif (XML2_FOUND)
+
+ # show the XML2_INCLUDE_DIRS and XML2_LIBRARIES variables only in the advanced view
+ mark_as_advanced(XML2_INCLUDE_DIRS XML2_LIBRARIES)
+
+endif (XML2_LIBRARIES AND XML2_INCLUDE_DIRS)
+
Modified: branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/darwin-config.py 2011-09-08 18:58:07 UTC (rev 40044)
+++ branches/soc-2011-tomato/build_files/scons/config/darwin-config.py 2011-09-08 18:59:35 UTC (rev 40045)
@@ -14,7 +14,7 @@
################### Cocoa & architecture settings ##################
#############################################################################
WITH_GHOST_COCOA=True
-MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64
+MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
cmd = 'uname -p'
Modified: branches/soc-2011-tomato/doc/python_api/examples/bge.texture.1.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/examples/bge.texture.1.py 2011-09-08 18:58:07 UTC (rev 40044)
+++ branches/soc-2011-tomato/doc/python_api/examples/bge.texture.1.py 2011-09-08 18:59:35 UTC (rev 40045)
@@ -14,7 +14,7 @@
object = cont.owner
# get the reference pointer (ID) of the internal texture
- ID = texture.materialID(obj, 'IMoriginal.png')
+ ID = texture.materialID(object, 'IMoriginal.png')
# create a texture object
object_texture = texture.Texture(object, ID)
Modified: branches/soc-2011-tomato/doc/python_api/examples/bpy.types.Operator.py
===================================================================
--- branches/soc-2011-tomato/doc/python_api/examples/bpy.types.Operator.py 2011-09-08 18:58:07 UTC (rev 40044)
+++ branches/soc-2011-tomato/doc/python_api/examples/bpy.types.Operator.py 2011-09-08 18:59:35 UTC (rev 40045)
@@ -21,7 +21,7 @@
print("Hello World")
return {'FINISHED'}
-bpy.utils.register_class(SimpleOperator)
+bpy.utils.register_class(HelloWorldOperator)
# test call to the newly defined operator
bpy.ops.wm.hello_world()
Modified: branches/soc-2011-tomato/doc/python_api/rst/info_tips_and_tricks.rst
===================================================================
--- branches/soc-2011-tomato/doc/python_api/rst/info_tips_and_tricks.rst 2011-09-08 18:58:07 UTC (rev 40044)
+++ branches/soc-2011-tomato/doc/python_api/rst/info_tips_and_tricks.rst 2011-09-08 18:59:35 UTC (rev 40045)
@@ -2,9 +2,11 @@
Tips and Tricks
***************
-Some of these are just python features that scripters may not have thaught to use with blender.
+Here are various suggestions that you might find useful when writing scripts.
+Some of these are just python features that scripters may not have thought to use with blender, others are blender specific.
+
Use The Terminal
================
@@ -14,45 +16,38 @@
* You can see the output of `print()` as you're script runs, which is useful to view debug info.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list