[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44420] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 44419.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sat Feb 25 02:26:54 CET 2012


Revision: 44420
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44420
Author:   kjym3
Date:     2012-02-25 01:26:45 +0000 (Sat, 25 Feb 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 44419.

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/creator/CMakeLists.txt

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
    branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
    branches/soc-2008-mxcurioni/extern/recastnavigation/Detour/Source/DetourStatNavMesh.cpp
    branches/soc-2008-mxcurioni/extern/recastnavigation/Recast/Source/RecastLayers.cpp
    branches/soc-2008-mxcurioni/intern/cycles/device/device_multi.cpp
    branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_oren_nayar.h
    branches/soc-2008-mxcurioni/intern/cycles/render/session.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/session.h
    branches/soc-2008-mxcurioni/intern/ffmpeg/ffmpeg_compat.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowManager.cpp
    branches/soc-2008-mxcurioni/intern/string/STR_String.h
    branches/soc-2008-mxcurioni/intern/string/intern/STR_String.cpp
    branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/elsyiun.xml
    branches/soc-2008-mxcurioni/release/scripts/presets/keyconfig/maya.py
    branches/soc-2008-mxcurioni/release/text/readme.html
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_multires.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_writeffmpeg.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/boids.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/editderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mball.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ocean.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sound.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/tracking.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/unit.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_pbvh.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenlib/SConscript
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_args.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_linklist.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/pbvh.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/SConscript
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_class.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_iterators.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_operator_api.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_queries.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/docs/bmesh_design.mwiki
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_interp.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_iterators.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_iterators_inline.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mods.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_newcore.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_structure.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_structure.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_connect.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_dissolve.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_dupe.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_mesh_conv.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_primitive.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_subdivide.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/tools/BME_bevel.c
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/bmesh_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/bmesh_selecthistory.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/bmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/bmesh_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/space_clip.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_header.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawanimviz.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/soc-2008-mxcurioni/source/blender/gpu/GPU_buffers.h
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/scaling.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_bevel.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cloth.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_collision.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mirror.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_uvproject.c
    branches/soc-2008-mxcurioni/source/blender/nodes/NOD_composite.h
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/soc-2008-mxcurioni/source/blender/python/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/python/SConscript
    branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.h
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/blenderplayer/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_System.h
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderGL.h
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderSystem.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureChannel.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureConstraint.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_MeshDeformer.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ModifierDeformer.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeDeformer.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BlenderWorldInfo.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertActuators.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertControllers.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertProperties.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertSensors.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_IpoConvert.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_SoftBodyDeformer.h
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/EXP_C-Api.h
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/IdentifierExpr.h
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/KX_HashedPtr.h
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/KX_Python.h
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/Value.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ANDController.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ActuatorSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_AlwaysSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_BasicEventManager.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_DelaySensor.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_EventManager.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ExpressionController.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IController.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IInputDevice.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IObject.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IScene.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ISensor.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_JoystickManager.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardManager.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_LogicManager.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_MouseManager.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_MouseSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_NANDController.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_NORController.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ORController.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertyActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertyEventManager.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertySensor.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonController.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonKeyboard.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonMouse.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomEventManager.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomNumberGenerator.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_TimeEventManager.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_XNORController.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_XORController.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_Canvas.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_Engine.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_MouseDevice.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RenderTools.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_System.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_System.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/blender_plugin_types.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Action.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_ActionManager.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ArmatureSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Camera.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CameraActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CameraIpoSGController.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ClientObjectInfo.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConstraintActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConstraintWrapper.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_EmptyObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_FontObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IInterpolator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IPOTransform.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IPO_SGController.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IPhysicsController.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IScalarInterpolator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ISystem.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IpoActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Light.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_LightIpoSGController.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MeshProxy.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MotionState.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MouseFocusSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_NavMeshObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_NearSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObjectActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObstacleSimulation.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_OrientationInterpolator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PhysicsPropertiesobsolete.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PositionInterpolator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyConstraintBinding.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RadarSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RayEventManager.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RaySensor.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SG_NodeRelationships.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ScalarInterpolator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ScalingInterpolator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SceneActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_StateActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SteeringActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TimeCategoryLogger.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TimeLogger.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TouchEventManager.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_VehicleWrapper.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_VertexProxy.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_VisibilityActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_WorldInfo.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_WorldIpoController.h
    branches/soc-2008-mxcurioni/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.h
    branches/soc-2008-mxcurioni/source/gameengine/Network/NG_NetworkDeviceInterface.h
    branches/soc-2008-mxcurioni/source/gameengine/Network/NG_NetworkMessage.h
    branches/soc-2008-mxcurioni/source/gameengine/Network/NG_NetworkObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Network/NG_NetworkScene.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdGraphicController.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_DynamicTypes.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IController.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IGraphicController.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IMotionState.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IPhysicsController.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IVehicle.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_Pro.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_CameraData.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_ICanvas.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IRenderTools.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_LightObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_ObjectColor.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Blur2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Dilation2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Erosion2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_GrayScale2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Invert2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Laplacian2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Prewitt2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sepia2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sharpen2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLFilters/RAS_Sobel2DFilter.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_Polygon.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_Rect.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_TexMatrix.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_Controller.h
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_DList.h
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_IObject.h
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_Node.h
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_ParentRelation.h
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_QList.h
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_Spatial.h

Added Paths:
-----------
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_bitmap.h
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bmesh_private.h

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
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,44229-44230
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44288
   + /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
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2012-02-24 21:45:59 UTC (rev 44419)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2012-02-25 01:26:45 UTC (rev 44420)
@@ -254,7 +254,6 @@
 		"Choose the minimum OSX version required: 10.4 or 10.5"
 		FORCE)
 	endif()
-	MESSAGE(STATUS ${CMAKE_GENERATOR})
 	if(${CMAKE_GENERATOR} MATCHES "Xcode")
 		if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4)
 			# Xcode 4 defaults to the Apple LLVM Compiler.

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py	2012-02-24 21:45:59 UTC (rev 44419)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py	2012-02-25 01:26:45 UTC (rev 44420)
@@ -102,7 +102,7 @@
 
 # enable ffmpeg  support
 WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR + '/ffmpeg_0.10'
+BF_FFMPEG = LIBDIR + '/ffmpeg'
 BF_FFMPEG_INC = "${BF_FFMPEG}/include"
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg bz2'

Modified: branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py	2012-02-24 21:45:59 UTC (rev 44419)
+++ branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py	2012-02-25 01:26:45 UTC (rev 44420)
@@ -66,12 +66,12 @@
     FILTER_BPY_OPS = None
 
 else:
-    EXCLUDE_INFO_DOCS = False
+    EXCLUDE_INFO_DOCS = True
     # for testing so doc-builds dont take so long.
     EXCLUDE_MODULES = (
         "bpy.context",
-        #"bpy.app",
-        #"bpy.app.handlers",
+        "bpy.app",
+        "bpy.app.handlers",
         "bpy.path",
         "bpy.data",
         "bpy.props",
@@ -88,6 +88,9 @@
         "mathutils",
         "mathutils.geometry",
         "mathutils.noise",
+        #"bmesh",
+        #"bmesh.types",
+        #"bmesh.utils",
         "Freestyle",
     )
 
@@ -1197,12 +1200,14 @@
     fw(".. toctree::\n")
     fw("   :maxdepth: 1\n\n")
 
+    # mathutils
     if "mathutils" not in EXCLUDE_MODULES:
         fw("   mathutils.rst\n\n")
     if "mathutils.geometry" not in EXCLUDE_MODULES:
         fw("   mathutils.geometry.rst\n\n")
     if "mathutils.noise" not in EXCLUDE_MODULES:
         fw("   mathutils.noise.rst\n\n")
+    # misc
     if "Freestyle" not in EXCLUDE_MODULES:
         fw("   Freestyle.rst\n\n")
     if "bgl" not in EXCLUDE_MODULES:
@@ -1215,6 +1220,13 @@
         fw("   aud.rst\n\n")
     if "bpy_extras" not in EXCLUDE_MODULES:
         fw("   bpy_extras.rst\n\n")
+    # bmesh
+    if "bmesh" not in EXCLUDE_MODULES:
+        fw("   bmesh.rst\n\n")
+    if "bmesh.types" not in EXCLUDE_MODULES:
+        fw("   bmesh.types.rst\n\n")
+    if "bmesh.utils" not in EXCLUDE_MODULES:
+        fw("   bmesh.utils.rst\n\n")
 
     # game engine
     if "bge" not in EXCLUDE_MODULES:
@@ -1348,6 +1360,18 @@
         import mathutils.noise as module
         pymodule2sphinx(BASEPATH, "mathutils.noise", module, "Noise Utilities")
 
+    if "bmesh" not in EXCLUDE_MODULES:
+        import bmesh as module
+        pymodule2sphinx(BASEPATH, "bmesh", module, "BMesh Module")
+
+    if "bmesh.types" not in EXCLUDE_MODULES:
+        import bmesh.types as module
+        pymodule2sphinx(BASEPATH, "bmesh.types", module, "BMesh Types")
+
+    if "bmesh.utils" not in EXCLUDE_MODULES:
+        import bmesh.utils as module
+        pymodule2sphinx(BASEPATH, "bmesh.utils", module, "BMesh Utilities")
+
     if "Freestyle" not in EXCLUDE_MODULES:
         import Freestyle as module
         pymodule2sphinx(BASEPATH, "Freestyle", module, "Freestyle Data Types & Operators")

Modified: branches/soc-2008-mxcurioni/extern/recastnavigation/Detour/Source/DetourStatNavMesh.cpp
===================================================================
--- branches/soc-2008-mxcurioni/extern/recastnavigation/Detour/Source/DetourStatNavMesh.cpp	2012-02-24 21:45:59 UTC (rev 44419)
+++ branches/soc-2008-mxcurioni/extern/recastnavigation/Detour/Source/DetourStatNavMesh.cpp	2012-02-25 01:26:45 UTC (rev 44420)
@@ -566,7 +566,7 @@
 			hitPos[2] = vj[2] + (vi[2] - vj[2])*tseg;
 		}
 
-		// Check to see if teh circle expands to one of the neighbours and expand.
+		// Check to see if the circle expands to one of the neighbours and expand.
 		for (int i = 0, j = (int)poly->nv-1; i < (int)poly->nv; j = i++)
 		{
 			// Skip solid edges.

Modified: branches/soc-2008-mxcurioni/extern/recastnavigation/Recast/Source/RecastLayers.cpp
===================================================================
--- branches/soc-2008-mxcurioni/extern/recastnavigation/Recast/Source/RecastLayers.cpp	2012-02-24 21:45:59 UTC (rev 44419)
+++ branches/soc-2008-mxcurioni/extern/recastnavigation/Recast/Source/RecastLayers.cpp	2012-02-25 01:26:45 UTC (rev 44420)
@@ -368,7 +368,7 @@
 				rcLayerRegion& rj = regs[j];
 				if (!rj.base) continue;
 				
-				// Skip if teh regions are not close to each other.
+				// Skip if the regions are not close to each other.
 				if (!overlapRange(ri.ymin,ri.ymax+mergeHeight, rj.ymin,rj.ymax+mergeHeight))
 					continue;
 				// Skip if the height range would become too large.

Modified: branches/soc-2008-mxcurioni/intern/cycles/device/device_multi.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/device/device_multi.cpp	2012-02-24 21:45:59 UTC (rev 44419)
+++ branches/soc-2008-mxcurioni/intern/cycles/device/device_multi.cpp	2012-02-25 01:26:45 UTC (rev 44420)
@@ -293,7 +293,7 @@
 	return new MultiDevice(info, background);
 }
 
-static void device_multi_add(vector<DeviceInfo>& devices, DeviceType type, bool with_display, const char *id_fmt, int num)
+static bool device_multi_add(vector<DeviceInfo>& devices, DeviceType type, bool with_display, bool with_advanced_shading, const char *id_fmt, int num)
 {
 	DeviceInfo info;
 
@@ -302,10 +302,12 @@
 	map<string, int>::iterator dt;
 	int num_added = 0, num_display = 0;
 
-	info.advanced_shading = true;
+	info.advanced_shading = with_advanced_shading;
 
 	foreach(DeviceInfo& subinfo, devices) {
 		if(subinfo.type == type) {
+			if(subinfo.advanced_shading != info.advanced_shading)
+				continue;
 			if(subinfo.display_device) {
 				if(with_display)
 					num_display++;
@@ -323,14 +325,12 @@
 			info.multi_devices.push_back(subinfo);
 			if(subinfo.display_device)
 				info.display_device = true;
-			if(!subinfo.advanced_shading)
-				info.advanced_shading = false;
 			num_added++;
 		}
 	}
 
 	if(num_added <= 1 || (with_display && num_display == 0))
-		return;
+		return false;
 
 	/* generate string */
 	stringstream desc;
@@ -384,17 +384,24 @@
 		devices.push_back(info);
 	else
 		devices.insert(devices.begin(), info);
+	
+	return true;
 }
 
 void device_multi_info(vector<DeviceInfo>& devices)
 {
 	int num = 0;
-	device_multi_add(devices, DEVICE_CUDA, false, "CUDA_MULTI_%d", num++);
-	device_multi_add(devices, DEVICE_CUDA, true, "CUDA_MULTI_%d", num++);
 
+	if(!device_multi_add(devices, DEVICE_CUDA, false, true, "CUDA_MULTI_%d", num++))
+		device_multi_add(devices, DEVICE_CUDA, false, false, "CUDA_MULTI_%d", num++);
+	if(!device_multi_add(devices, DEVICE_CUDA, true, true, "CUDA_MULTI_%d", num++))
+		device_multi_add(devices, DEVICE_CUDA, true, false, "CUDA_MULTI_%d", num++);
+
 	num = 0;
-	device_multi_add(devices, DEVICE_OPENCL, false, "OPENCL_MULTI_%d", num++);
-	device_multi_add(devices, DEVICE_OPENCL, true, "OPENCL_MULTI_%d", num++);
+	if(!device_multi_add(devices, DEVICE_OPENCL, false, true, "OPENCL_MULTI_%d", num++))
+		device_multi_add(devices, DEVICE_OPENCL, false, false, "OPENCL_MULTI_%d", num++);
+	if(!device_multi_add(devices, DEVICE_OPENCL, true, true, "OPENCL_MULTI_%d", num++))
+		device_multi_add(devices, DEVICE_OPENCL, true, false, "OPENCL_MULTI_%d", num++);
 }
 
 CCL_NAMESPACE_END

Modified: branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp	2012-02-24 21:45:59 UTC (rev 44419)
+++ branches/soc-2008-mxcurioni/intern/cycles/device/device_opencl.cpp	2012-02-25 01:26:45 UTC (rev 44420)
@@ -301,7 +301,7 @@
 		/* full shading only on NVIDIA cards at the moment */
 		if(platform_name == "NVIDIA CUDA")
 			build_options += "-D__KERNEL_SHADING__ -D__MULTI_CLOSURE__ -cl-nv-maxrregcount=24 -cl-nv-verbose ";
-		if(platform_name == "Apple")
+		if(platform_name == "Apple" || platform_name == "AMD Accelerated Parallel Processing")
 			build_options += " -D__CL_NO_FLOAT3__ ";
 
 		return build_options;

Modified: branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt	2012-02-24 21:45:59 UTC (rev 44419)
+++ branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt	2012-02-25 01:26:45 UTC (rev 44420)
@@ -104,7 +104,7 @@
 		set(CUDA_BITS 32)
 	endif()
 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list