[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48402] branches/soc-2012-swiss_cheese: Merge w/ Trunk: r48303-r48394

Jason Wilkins Jason.A.Wilkins at gmail.com
Fri Jun 29 13:32:17 CEST 2012


Revision: 48402
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48402
Author:   jwilkins
Date:     2012-06-29 11:32:12 +0000 (Fri, 29 Jun 2012)
Log Message:
-----------
Merge w/ Trunk: r48303-r48394

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

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/CMakeLists.txt
    branches/soc-2012-swiss_cheese/build_files/cmake/macros.cmake
    branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.ops.1.py
    branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.ops.2.py
    branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.ops.py
    branches/soc-2012-swiss_cheese/doc/python_api/rst/bge.types.rst
    branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_SystemPathsX11.cpp
    branches/soc-2012-swiss_cheese/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2012-swiss_cheese/intern/guardedalloc/cpp/mallocn.cpp
    branches/soc-2012-swiss_cheese/intern/guardedalloc/intern/mallocn.c
    branches/soc-2012-swiss_cheese/release/scripts/modules/addon_utils.py
    branches/soc-2012-swiss_cheese/release/scripts/modules/bpy/ops.py
    branches/soc-2012-swiss_cheese/release/scripts/modules/bpy/utils.py
    branches/soc-2012-swiss_cheese/release/scripts/startup/bl_ui/space_node.py
    branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2012-swiss_cheese/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/anim.c
    branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/collision.c
    branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/image.c
    branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/mask.c
    branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/unit.c
    branches/soc-2012-swiss_cheese/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/fileops.c
    branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/path_util.c
    branches/soc-2012-swiss_cheese/source/blender/blenlib/intern/voronoi.c
    branches/soc-2012-swiss_cheese/source/blender/bmesh/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2012-swiss_cheese/source/blender/bmesh/intern/bmesh_queries.h
    branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_hull.c
    branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_primitive.c
    branches/soc-2012-swiss_cheese/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/soc-2012-swiss_cheese/source/blender/collada/MeshImporter.cpp
    branches/soc-2012-swiss_cheese/source/blender/collada/SceneExporter.cpp
    branches/soc-2012-swiss_cheese/source/blender/collada/collada_utils.cpp
    branches/soc-2012-swiss_cheese/source/blender/compositor/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/compositor/intern/COM_MemoryProxy.h
    branches/soc-2012-swiss_cheese/source/blender/compositor/intern/COM_OpenCLDevice.cpp
    branches/soc-2012-swiss_cheese/source/blender/compositor/nodes/COM_MathNode.cpp
    branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_BlurBaseOperation.cpp
    branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_ChannelMatteOperation.h
    branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_ConvertRGBToYCCOperation.cpp
    branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_ConvertYCCToRGBOperation.cpp
    branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_KeyingScreenOperation.cpp
    branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_KeyingScreenOperation.h
    branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h
    branches/soc-2012-swiss_cheese/source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h
    branches/soc-2012-swiss_cheese/source/blender/editors/animation/anim_filter.c
    branches/soc-2012-swiss_cheese/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2012-swiss_cheese/source/blender/editors/armature/editarmature.c
    branches/soc-2012-swiss_cheese/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2012-swiss_cheese/source/blender/editors/curve/editcurve.c
    branches/soc-2012-swiss_cheese/source/blender/editors/include/ED_anim_api.h
    branches/soc-2012-swiss_cheese/source/blender/editors/include/UI_view2d.h
    branches/soc-2012-swiss_cheese/source/blender/editors/interface/resources.c
    branches/soc-2012-swiss_cheese/source/blender/editors/interface/view2d.c
    branches/soc-2012-swiss_cheese/source/blender/editors/io/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/editors/io/io_collada.c
    branches/soc-2012-swiss_cheese/source/blender/editors/io/io_ops.h
    branches/soc-2012-swiss_cheese/source/blender/editors/mesh/meshtools.c
    branches/soc-2012-swiss_cheese/source/blender/editors/screen/screen_ops.c
    branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2012-swiss_cheese/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2012-swiss_cheese/source/blender/editors/space_action/action_select.c
    branches/soc-2012-swiss_cheese/source/blender/editors/space_node/drawnode.c
    branches/soc-2012-swiss_cheese/source/blender/editors/space_node/node_draw.c
    branches/soc-2012-swiss_cheese/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/soc-2012-swiss_cheese/source/blender/editors/space_text/text_ops.c
    branches/soc-2012-swiss_cheese/source/blender/editors/space_userpref/space_userpref.c
    branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform.c
    branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_constraints.c
    branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_conversions.c
    branches/soc-2012-swiss_cheese/source/blender/editors/transform/transform_snap.c
    branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/allocimbuf.c
    branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/imbuf.h
    branches/soc-2012-swiss_cheese/source/blender/imbuf/intern/tiff.c
    branches/soc-2012-swiss_cheese/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2012-swiss_cheese/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/makesrna.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_define.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_main.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_mask.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_object.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2012-swiss_cheese/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/soc-2012-swiss_cheese/source/blender/opencl/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/python/bmesh/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/blender/python/bmesh/bmesh_py_api.c
    branches/soc-2012-swiss_cheese/source/blender/python/bmesh/bmesh_py_types.h
    branches/soc-2012-swiss_cheese/source/blender/python/bmesh/bmesh_py_utils.c
    branches/soc-2012-swiss_cheese/source/blender/python/intern/bpy_operator.c
    branches/soc-2012-swiss_cheese/source/blender/python/mathutils/mathutils.c
    branches/soc-2012-swiss_cheese/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2012-swiss_cheese/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2012-swiss_cheese/source/blender/render/intern/raytrace/bvh.h
    branches/soc-2012-swiss_cheese/source/blender/render/intern/raytrace/rayobject_instance.cpp
    branches/soc-2012-swiss_cheese/source/blender/windowmanager/WM_api.h
    branches/soc-2012-swiss_cheese/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2012-swiss_cheese/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2012-swiss_cheese/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/GameLogic/CMakeLists.txt
    branches/soc-2012-swiss_cheese/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/GameLogic/SConscript
    branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_FontObject.h
    branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2012-swiss_cheese/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/soc-2012-swiss_cheese/source/tools/check_style_c.py

Added Paths:
-----------
    branches/soc-2012-swiss_cheese/source/blender/python/bmesh/bmesh_py_ops.c
    branches/soc-2012-swiss_cheese/source/blender/python/bmesh/bmesh_py_ops.h

Property Changed:
----------------
    branches/soc-2012-swiss_cheese/


Property changes on: branches/soc-2012-swiss_cheese
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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,44229-44230,45623-45625,46037
/trunk/blender:46806-48302
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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,44229-44230,45623-45625,46037
/trunk/blender:46806-48394

Modified: branches/soc-2012-swiss_cheese/CMakeLists.txt
===================================================================
--- branches/soc-2012-swiss_cheese/CMakeLists.txt	2012-06-29 11:28:01 UTC (rev 48401)
+++ branches/soc-2012-swiss_cheese/CMakeLists.txt	2012-06-29 11:32:12 UTC (rev 48402)
@@ -123,7 +123,7 @@
 mark_as_advanced(WITH_PYTHON_SECURITY)  # some distrobutions see this as a security issue, rather than have them patch it, make a build option.
 
 option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
-option(WITH_PYTHON_MODULE "Enable building as a python module (experimental, only enable for development)" OFF)
+option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development)" OFF)
 option(WITH_BUILDINFO     "Include extra build details (only disable for development & faster builds)" ON)
 option(WITH_IK_ITASC      "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
 option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
@@ -499,11 +499,6 @@
 
 if(UNIX AND NOT APPLE)
 
-	# needed for ubuntu 11.04
-	if(EXISTS "/usr/lib/x86_64-linux-gnu")
-		set(CMAKE_LIBRARY_PATH "/usr/lib/x86_64-linux-gnu;${CMAKE_LIBRARY_PATH}")
-	endif()
-
 	# set lib directory if it exists
 	if(WITH_ANDROID)
 		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/android/${ANDROID_TARGET})

Modified: branches/soc-2012-swiss_cheese/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2012-swiss_cheese/build_files/cmake/macros.cmake	2012-06-29 11:28:01 UTC (rev 48401)
+++ branches/soc-2012-swiss_cheese/build_files/cmake/macros.cmake	2012-06-29 11:32:12 UTC (rev 48402)
@@ -236,8 +236,7 @@
 			${OPENGL_glu_LIBRARY}
 			${PNG_LIBRARIES}
 			${ZLIB_LIBRARIES}
-			${FREETYPE_LIBRARY}
-			${LAPACK_LIBRARIES})
+			${FREETYPE_LIBRARY})
 
 	# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
 	if(WITH_PYTHON)  # AND NOT WITH_PYTHON_MODULE  # WIN32 needs
@@ -346,7 +345,9 @@
 	if(WITH_INPUT_NDOF)
 		target_link_libraries(${target} ${NDOF_LIBRARIES})
 	endif()
-
+	if(WITH_MOD_CLOTH_ELTOPO)
+		target_link_libraries(${target} ${LAPACK_LIBRARIES})
+	endif()
 	if(WIN32 AND NOT UNIX)
 		target_link_libraries(${target} ${PTHREADS_LIBRARIES})
 	endif()
@@ -452,6 +453,12 @@
 		add_cc_flag("${CC_REMOVE_STRICT_FLAGS}")
 	endif()
 
+	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+		remove_cc_flag("-Wunused-parameter")
+		remove_cc_flag("-Wunused-variable")
+		remove_cc_flag("-Werror")
+	endif()
+
 	if(MSVC)
 		# TODO
 	endif()

Modified: branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.ops.1.py
===================================================================
--- branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.ops.1.py	2012-06-29 11:28:01 UTC (rev 48401)
+++ branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.ops.1.py	2012-06-29 11:32:12 UTC (rev 48402)
@@ -1,22 +1,17 @@
 """
-Execution Context
-+++++++++++++++++
+Overriding Context
+------------------
 
-When calling an operator you may want to pass the execution context.
+It is possible to override context members that the operator sees, so that they
+act on specified rather than the selected or active data, or to execute an
+operator in the different part of the user interface.
 
-This determines the context thats given to the operator to run in, and weather
-invoke() is called or execute().
-
-'EXEC_DEFAULT' is used by default but you may want the operator to take user
-interaction with 'INVOKE_DEFAULT'.
-
-The execution context is as a non keyword, string argument in:
-('INVOKE_DEFAULT', 'INVOKE_REGION_WIN', 'INVOKE_REGION_CHANNELS',
-'INVOKE_REGION_PREVIEW', 'INVOKE_AREA', 'INVOKE_SCREEN', 'EXEC_DEFAULT',
-'EXEC_REGION_WIN', 'EXEC_REGION_CHANNELS', 'EXEC_REGION_PREVIEW', 'EXEC_AREA',
-'EXEC_SCREEN')
+The context overrides are passed as a dictionary, with keys matching the context
+member names in bpy.context. For example to override bpy.context.active_object,
+you would pass {'active_object': object}.
 """
 
-# group add popup
+# remove all objects in scene rather than the selected ones
 import bpy
-bpy.ops.object.group_instance_add('INVOKE_DEFAULT')
+override = {'selected_bases': list(bpy.context.scene.object_bases)}
+bpy.ops.object.delete(override)

Modified: branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.ops.2.py
===================================================================
--- branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.ops.2.py	2012-06-29 11:28:01 UTC (rev 48401)
+++ branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.ops.2.py	2012-06-29 11:32:12 UTC (rev 48402)
@@ -1,17 +1,22 @@
 """
-Overriding Context
-++++++++++++++++++
+Execution Context
+-----------------
 
-It is possible to override context members that the operator sees, so that they
-act on specified rather than the selected or active data, or to execute an
-operator in the different part of the user interface.
+When calling an operator you may want to pass the execution context.
 
-The context overrides are passed as a dictionary, with keys matching the context
-member names in bpy.context. For example to override bpy.context.active_object,
-you would pass {'active_object': object}.
+This determines the context thats given to the operator to run in, and weather
+invoke() is called or execute().
+
+'EXEC_DEFAULT' is used by default but you may want the operator to take user
+interaction with 'INVOKE_DEFAULT'.
+
+The execution context is as a non keyword, string argument in:
+('INVOKE_DEFAULT', 'INVOKE_REGION_WIN', 'INVOKE_REGION_CHANNELS',
+'INVOKE_REGION_PREVIEW', 'INVOKE_AREA', 'INVOKE_SCREEN', 'EXEC_DEFAULT',
+'EXEC_REGION_WIN', 'EXEC_REGION_CHANNELS', 'EXEC_REGION_PREVIEW', 'EXEC_AREA',
+'EXEC_SCREEN')
 """
 
-# remove all objects in scene rather than the selected ones
+# group add popup
 import bpy
-override = {'selected_bases': list(bpy.context.scene.object_bases)}
-bpy.ops.object.delete(override)
+bpy.ops.object.group_instance_add('INVOKE_DEFAULT')
\ No newline at end of file

Modified: branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.ops.py
===================================================================
--- branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.ops.py	2012-06-29 11:28:01 UTC (rev 48401)
+++ branches/soc-2012-swiss_cheese/doc/python_api/examples/bpy.ops.py	2012-06-29 11:32:12 UTC (rev 48402)
@@ -1,6 +1,6 @@
 """
 Calling Operators
-+++++++++++++++++
+-----------------
 
 Provides python access to calling operators, this includes operators written in
 C, Python or Macros.
@@ -18,6 +18,26 @@
 
 Note that the operator ID (bl_idname) in this example is 'mesh.subdivide',
 'bpy.ops' is just the access path for python.
+
+
+Keywords and Positional Arguments
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+For calling operators keywords are used for operator properties and
+positional arguments are used to define how the operator is called.
+
+There are 3 optional positional arguments (documented in detail below).
+
+.. code-block:: python
+
+   bpy.ops.test.operator(override_context, execution_context, undo)
+
+* override_context - dict type
+* execution_context - string (enum)
+* undo - boolean
+
+
+Each of these arguments is optional, but must be given in the order above.
 """
 import bpy
 

Modified: branches/soc-2012-swiss_cheese/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/soc-2012-swiss_cheese/doc/python_api/rst/bge.types.rst	2012-06-29 11:28:01 UTC (rev 48401)
+++ branches/soc-2012-swiss_cheese/doc/python_api/rst/bge.types.rst	2012-06-29 11:32:12 UTC (rev 48402)
@@ -72,6 +72,20 @@
 
       :type: dictionary {:ref:`keycode<keyboard-keys>`::ref:`status<input-status>`, ...}
 
+
+   .. function:: getClipboard()
+
+      Gets the clipboard text.
+
+      :rtype: string
+
+   .. function:: setClipboard(text)
+
+      Sets the clipboard text.
+
+      :arg text: New clipboard text
+      :type text: string
+
 .. class:: SCA_PythonMouse(PyObjectPlus)
 
    The current mouse.
@@ -242,12 +256,6 @@
 
       :type: string
 
-   .. attribute:: channelNames
-
-      A list of channel names that may be used with :data:`setChannel` and :data:`getChannel`.
-
-      :type: list of strings
-
    .. attribute:: frameStart
 
       Specifies the starting frame of the animation.
@@ -308,26 +316,6 @@
 
       :type: string
 
-   .. method:: setChannel(channel, matrix)
-
-      Alternative to the 2 arguments, 4 arguments (channel, matrix, loc, size, quat) are also supported.
-
-      :arg channel: A string specifying the name of the bone channel, error raised if not in :data:`channelNames`.
-      :type channel: string

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list