[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61211] branches/vgroup_modifiers: svn merge -r61052:61210 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Bastien Montagne montagne29 at wanadoo.fr
Sat Nov 9 16:03:16 CET 2013 

Revision: 61211
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61211
Author:   mont29
Date:     2013-11-09 15:03:16 +0000 (Sat, 09 Nov 2013)
Log Message:
-----------
svn merge -r61052:61210 https://svn.blender.org/svnroot/bf-blender/trunk/blender

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

Modified Paths:
--------------
    branches/vgroup_modifiers/CMakeLists.txt
    branches/vgroup_modifiers/SConstruct
    branches/vgroup_modifiers/build_files/buildbot/config/user-config-mac-i386.py
    branches/vgroup_modifiers/build_files/buildbot/config/user-config-mac-x86_64.py
    branches/vgroup_modifiers/build_files/cmake/buildinfo.cmake
    branches/vgroup_modifiers/build_files/cmake/macros.cmake
    branches/vgroup_modifiers/build_files/scons/config/darwin-config.py
    branches/vgroup_modifiers/build_files/scons/config/freebsd8-config.py
    branches/vgroup_modifiers/build_files/scons/config/linux-config.py
    branches/vgroup_modifiers/build_files/scons/config/linuxcross-config.py
    branches/vgroup_modifiers/build_files/scons/config/win32-mingw-config.py
    branches/vgroup_modifiers/build_files/scons/config/win32-vc-config.py
    branches/vgroup_modifiers/build_files/scons/config/win64-mingw-config.py
    branches/vgroup_modifiers/build_files/scons/tools/Blender.py
    branches/vgroup_modifiers/build_files/scons/tools/btools.py
    branches/vgroup_modifiers/extern/bullet2/readme.txt
    branches/vgroup_modifiers/extern/libmv/third_party/ceres/SConscript
    branches/vgroup_modifiers/extern/libmv/third_party/ceres/bundle.sh
    branches/vgroup_modifiers/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/vgroup_modifiers/intern/cycles/kernel/svm/svm_fresnel.h
    branches/vgroup_modifiers/intern/cycles/render/nodes.cpp
    branches/vgroup_modifiers/intern/ghost/CMakeLists.txt
    branches/vgroup_modifiers/intern/ghost/SConscript
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_ISystem.cpp
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_ISystemPaths.cpp
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/vgroup_modifiers/intern/locale/CMakeLists.txt
    branches/vgroup_modifiers/intern/locale/SConscript
    branches/vgroup_modifiers/intern/rigidbody/CMakeLists.txt
    branches/vgroup_modifiers/intern/tools/credits_svn_gen.py
    branches/vgroup_modifiers/release/scripts/modules/animsys_refactor.py
    branches/vgroup_modifiers/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
    branches/vgroup_modifiers/release/scripts/modules/bl_i18n_utils/settings.py
    branches/vgroup_modifiers/release/scripts/modules/bl_i18n_utils/utils.py
    branches/vgroup_modifiers/release/scripts/modules/bpy_extras/keyconfig_utils.py
    branches/vgroup_modifiers/release/scripts/modules/bpy_extras/object_utils.py
    branches/vgroup_modifiers/release/scripts/modules/sys_info.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/anim.py
    branches/vgroup_modifiers/release/scripts/startup/bl_operators/node.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_render.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_scene.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_info.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_node.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_userpref.py
    branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py
    branches/vgroup_modifiers/source/blender/blenfont/intern/blf_font.c
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_blender.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_cdderivedmesh.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_main.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_mask.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_node.h
    branches/vgroup_modifiers/source/blender/blenkernel/BKE_writeffmpeg.h
    branches/vgroup_modifiers/source/blender/blenkernel/intern/DerivedMesh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/anim_sys.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/curve.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/fcurve.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/gpencil.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/mask.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/scene.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/smoke.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/unit.c
    branches/vgroup_modifiers/source/blender/blenkernel/intern/writeffmpeg.c
    branches/vgroup_modifiers/source/blender/blenlib/BLI_rect.h
    branches/vgroup_modifiers/source/blender/blenlib/intern/rct.c
    branches/vgroup_modifiers/source/blender/blenloader/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/blenloader/SConscript
    branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c
    branches/vgroup_modifiers/source/blender/blenloader/intern/writefile.c
    branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_wireframe.c
    branches/vgroup_modifiers/source/blender/collada/AnimationExporter.h
    branches/vgroup_modifiers/source/blender/collada/DocumentExporter.cpp
    branches/vgroup_modifiers/source/blender/compositor/nodes/COM_ColorBalanceNode.cpp
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.cpp
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h
    branches/vgroup_modifiers/source/blender/compositor/operations/COM_MaskOperation.cpp
    branches/vgroup_modifiers/source/blender/editors/animation/anim_filter.c
    branches/vgroup_modifiers/source/blender/editors/armature/armature_edit.c
    branches/vgroup_modifiers/source/blender/editors/armature/armature_intern.h
    branches/vgroup_modifiers/source/blender/editors/armature/armature_ops.c
    branches/vgroup_modifiers/source/blender/editors/armature/armature_select.c
    branches/vgroup_modifiers/source/blender/editors/curve/editcurve.c
    branches/vgroup_modifiers/source/blender/editors/curve/editcurve_add.c
    branches/vgroup_modifiers/source/blender/editors/include/ED_armature.h
    branches/vgroup_modifiers/source/blender/editors/include/ED_node.h
    branches/vgroup_modifiers/source/blender/editors/interface/interface.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_handlers.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_layout.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_regions.c
    branches/vgroup_modifiers/source/blender/editors/interface/interface_templates.c
    branches/vgroup_modifiers/source/blender/editors/interface/resources.c
    branches/vgroup_modifiers/source/blender/editors/mask/mask_shapekey.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_knife.c
    branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_tools.c
    branches/vgroup_modifiers/source/blender/editors/object/object_add.c
    branches/vgroup_modifiers/source/blender/editors/object/object_constraint.c
    branches/vgroup_modifiers/source/blender/editors/render/SConscript
    branches/vgroup_modifiers/source/blender/editors/render/render_ops.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_mask.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_ops.c
    branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/vgroup_modifiers/source/blender/editors/sound/SConscript
    branches/vgroup_modifiers/source/blender/editors/space_action/space_action.c
    branches/vgroup_modifiers/source/blender/editors/space_clip/tracking_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_file/file_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_file/filelist.c
    branches/vgroup_modifiers/source/blender/editors/space_file/fsmenu.c
    branches/vgroup_modifiers/source/blender/editors/space_graph/graph_edit.c
    branches/vgroup_modifiers/source/blender/editors/space_info/space_info.c
    branches/vgroup_modifiers/source/blender/editors/space_nla/space_nla.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_intern.h
    branches/vgroup_modifiers/source/blender/editors/space_node/node_ops.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_relationships.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_select.c
    branches/vgroup_modifiers/source/blender/editors/space_node/node_view.c
    branches/vgroup_modifiers/source/blender/editors/space_outliner/outliner_draw.c
    branches/vgroup_modifiers/source/blender/editors/space_outliner/space_outliner.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/drawobject.c
    branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_buttons.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform.h
    branches/vgroup_modifiers/source/blender/editors/transform/transform_constraints.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform_conversions.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform_ops.c
    branches/vgroup_modifiers/source/blender/editors/transform/transform_snap.c
    branches/vgroup_modifiers/source/blender/freestyle/intern/python/BPy_Convert.cpp
    branches/vgroup_modifiers/source/blender/freestyle/intern/python/BPy_Convert.h
    branches/vgroup_modifiers/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
    branches/vgroup_modifiers/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
    branches/vgroup_modifiers/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
    branches/vgroup_modifiers/source/blender/freestyle/intern/python/Director.cpp
    branches/vgroup_modifiers/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
    branches/vgroup_modifiers/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/vgroup_modifiers/source/blender/imbuf/intern/util.c
    branches/vgroup_modifiers/source/blender/makesdna/DNA_fileglobal_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_node_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_scene_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_space_types.h
    branches/vgroup_modifiers/source/blender/makesdna/DNA_userdef_types.h
    branches/vgroup_modifiers/source/blender/makesrna/RNA_access.h
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_access.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_fcurve.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_fluidsim.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_modifier.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_nodetree.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_space.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_tracking.c
    branches/vgroup_modifiers/source/blender/makesrna/intern/rna_userdef.c
    branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_fresnel.c
    branches/vgroup_modifiers/source/blender/python/generic/idprop_py_api.c
    branches/vgroup_modifiers/source/blender/python/intern/bpy_app.c
    branches/vgroup_modifiers/source/blender/python/intern/bpy_operator.c
    branches/vgroup_modifiers/source/blender/python/intern/bpy_rna_callback.c
    branches/vgroup_modifiers/source/blender/quicktime/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/quicktime/SConscript
    branches/vgroup_modifiers/source/blender/quicktime/quicktime_export.h
    branches/vgroup_modifiers/source/blender/quicktime/quicktime_import.h
    branches/vgroup_modifiers/source/blender/windowmanager/CMakeLists.txt
    branches/vgroup_modifiers/source/blender/windowmanager/SConscript
    branches/vgroup_modifiers/source/blender/windowmanager/WM_api.h
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_event_system.c
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_operators.c
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_window.c
    branches/vgroup_modifiers/source/blenderplayer/CMakeLists.txt
    branches/vgroup_modifiers/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/vgroup_modifiers/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/vgroup_modifiers/source/creator/CMakeLists.txt
    branches/vgroup_modifiers/source/creator/buildinfo.c
    branches/vgroup_modifiers/source/creator/creator.c
    branches/vgroup_modifiers/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/vgroup_modifiers/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/vgroup_modifiers/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/vgroup_modifiers/source/gameengine/Converter/BL_BlenderDataConversion.h
    branches/vgroup_modifiers/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/vgroup_modifiers/source/gameengine/Converter/BlenderWorldInfo.cpp
    branches/vgroup_modifiers/source/gameengine/Converter/BlenderWorldInfo.h
    branches/vgroup_modifiers/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/vgroup_modifiers/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/vgroup_modifiers/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/vgroup_modifiers/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
    branches/vgroup_modifiers/source/gameengine/GameLogic/SCA_ExpressionController.cpp
    branches/vgroup_modifiers/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/vgroup_modifiers/source/gameengine/GamePlayer/common/SConscript
    branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/vgroup_modifiers/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/BL_Action.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/CMakeLists.txt
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Camera.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_CharacterWrapper.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Dome.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Dome.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_FontObject.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_FontObject.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_GameObject.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Light.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Light.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_MotionState.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_MotionState.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_NavMeshObject.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_NearSensor.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_RayCast.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_RayCast.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Scene.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_Scene.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/vgroup_modifiers/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
    branches/vgroup_modifiers/source/gameengine/Physics/Bullet/CcdGraphicController.h
    branches/vgroup_modifiers/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/vgroup_modifiers/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/vgroup_modifiers/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/vgroup_modifiers/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/vgroup_modifiers/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
    branches/vgroup_modifiers/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
    branches/vgroup_modifiers/source/gameengine/Physics/common/PHY_IController.h
    branches/vgroup_modifiers/source/gameengine/Physics/common/PHY_IGraphicController.h
    branches/vgroup_modifiers/source/gameengine/Physics/common/PHY_IMotionState.h
    branches/vgroup_modifiers/source/gameengine/Physics/common/PHY_IPhysicsController.h
    branches/vgroup_modifiers/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
    branches/vgroup_modifiers/source/gameengine/Rasterizer/CMakeLists.txt
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_2DFilterManager.h
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_Polygon.cpp
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_Polygon.h
    branches/vgroup_modifiers/source/gameengine/VideoTexture/ImageRender.cpp
    branches/vgroup_modifiers/source/gameengine/VideoTexture/ImageRender.h
    branches/vgroup_modifiers/source/gameengine/VideoTexture/ImageViewport.cpp
    branches/vgroup_modifiers/source/gameengine/VideoTexture/Texture.cpp
    branches/vgroup_modifiers/source/tools/check_style_c.py

Added Paths:
-----------
    branches/vgroup_modifiers/intern/locale/msgfmt.cc

Removed Paths:
-------------
    branches/vgroup_modifiers/extern/bullet2/patches/ghost_softbody.patch
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_DisplayManagerCarbon.h
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemCarbon.h
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemPathsCarbon.h
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowCarbon.cpp
    branches/vgroup_modifiers/intern/ghost/intern/GHOST_WindowCarbon.h
    branches/vgroup_modifiers/source/blender/quicktime/apple/quicktime_export.c
    branches/vgroup_modifiers/source/blender/quicktime/apple/quicktime_import.c
    branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_apple.c
    branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderGL.h
    branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/vgroup_modifiers/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
    branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/vgroup_modifiers/source/gameengine/GamePlayer/common/GPC_RenderTools.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_IPhysicsController.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_IPhysicsController.h
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/vgroup_modifiers/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_IRenderTools.cpp
    branches/vgroup_modifiers/source/gameengine/Rasterizer/RAS_IRenderTools.h

Property Changed:
----------------
    branches/vgroup_modifiers/
    branches/vgroup_modifiers/extern/libmv/third_party/ceres/internal/ceres/block_random_access_crs_matrix.cc
    branches/vgroup_modifiers/extern/libmv/third_party/ceres/internal/ceres/c_api.cc
    branches/vgroup_modifiers/extern/libmv/third_party/ceres/internal/ceres/compressed_col_sparse_matrix_utils.cc
    branches/vgroup_modifiers/extern/libmv/third_party/ceres/internal/ceres/covariance_impl.cc
    branches/vgroup_modifiers/extern/libmv/third_party/ceres/internal/ceres/incomplete_lq_factorization.cc
    branches/vgroup_modifiers/extern/libmv/third_party/ceres/internal/ceres/lapack.cc
    branches/vgroup_modifiers/source/blender/editors/interface/interface.c
    branches/vgroup_modifiers/source/blender/editors/space_outliner/


Property changes on: branches/vgroup_modifiers
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_dev:58091-58422
/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,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,59942,60073,60094,60096,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:59888,60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-61052
   + /branches/ge_dev:58091-58422
/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,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,59942,60073,60094,60096,60105
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/branches/soc-2013-rigid_body_sim:59888,60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-61210

Modified: branches/vgroup_modifiers/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/CMakeLists.txt	2013-11-09 13:31:20 UTC (rev 61210)
+++ branches/vgroup_modifiers/CMakeLists.txt	2013-11-09 15:03:16 UTC (rev 61211)
@@ -218,7 +218,7 @@
 option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
 
 option(WITH_CODEC_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
-if(APPLE OR (WIN32 AND NOT UNIX))
+if(APPLE)
 	option(WITH_CODEC_QUICKTIME     "Enable Quicktime Support" OFF)
 endif()
 
@@ -380,12 +380,7 @@
 		add_definitions("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
 	endif()
 
-	option(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
-	option(USE_QTKIT	  "Use QtKit instead of Carbon quicktime (needed for having partial quicktime for 64bit)" OFF)
 	option(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
-	if(CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
-		set(USE_QTKIT ON CACHE BOOL "ON" FORCE) # no Quicktime in 64bit
-	endif()
 endif()
 
 
@@ -492,14 +487,6 @@
 	set(WITH_X11_XINPUT OFF)
 endif()
 
-if(MINGW)
-	if(WITH_CODEC_QUICKTIME)
-		message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
-		                    "because it is currently unsupported, remove this "
-		                    "line if youre a developer who wants to add support.")
-	endif()
-endif()
-
 TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
 
 TEST_STDBOOL_SUPPORT()
@@ -1030,13 +1017,6 @@
 		set(SDL_LIBPATH ${SDL}/lib)
 	endif()
 
-	if(WITH_CODEC_QUICKTIME)
-		set(QUICKTIME ${LIBDIR}/QTDevWin)
-		set(QUICKTIME_INCLUDE_DIRS ${QUICKTIME}/CIncludes)
-		set(QUICKTIME_LIBRARIES qtmlClient)
-		set(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
-	endif()
-
 	if(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD)
 		add_definitions(-D__SSE__ -D__MMX__)
 	endif()
@@ -1612,47 +1592,37 @@
 		set(PLATFORM_LINKLIBS stdc++)
 	endif()
 
-	if(WITH_COCOA)
-		set(PLATFORM_CFLAGS "-pipe -funsigned-char -DGHOST_COCOA")
-		set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio")
-		if(USE_QTKIT)
-			set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -DUSE_QTKIT")
-			set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
-			if(CMAKE_OSX_ARCHITECTURES MATCHES i386)
-				set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
-				# libSDL still needs 32bit carbon quicktime
-			endif()
-		elseif(WITH_CODEC_QUICKTIME)
+	set(PLATFORM_CFLAGS "-pipe -funsigned-char")
+	set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio")
+	if(WITH_CODEC_QUICKTIME)
+		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QTKit")
+		if(CMAKE_OSX_ARCHITECTURES MATCHES i386)
 			set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
+			# libSDL still needs 32bit carbon quicktime
 		endif()
+	endif()
 
-		# XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED!
-		# ALSO SHOULD BE MOVED INTO OWN MODULE WHEN FUNCTIONAL
-		if(WITH_INPUT_NDOF)
-			# This thread it *should* work and check the framework - campbell
-			# http://www.cmake.org/pipermail/cmake/2005-December/007740.html
-			find_library(3DCONNEXION_CLIENT_FRAMEWORK
-				NAMES 3DconnexionClient
-			)
-			if(NOT 3DCONNEXION_CLIENT_FRAMEWORK)
-				set(WITH_INPUT_NDOF OFF)
-			endif()
+	# XXX - SOME MAC DEV PLEASE TEST WITH THE SDK INSTALLED!
+	# ALSO SHOULD BE MOVED INTO OWN MODULE WHEN FUNCTIONAL
+	if(WITH_INPUT_NDOF)
+		# This thread it *should* work and check the framework - campbell
+		# http://www.cmake.org/pipermail/cmake/2005-December/007740.html
+		find_library(3DCONNEXION_CLIENT_FRAMEWORK
+			NAMES 3DconnexionClient
+		)
+		if(NOT 3DCONNEXION_CLIENT_FRAMEWORK)
+			set(WITH_INPUT_NDOF OFF)
+		endif()
 
-			if(WITH_INPUT_NDOF)
-				set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework 3DconnexionClient")
-				set(NDOF_INCLUDE_DIRS /Library/Frameworks/3DconnexionClient.framework/Headers )
-			endif()
+		if(WITH_INPUT_NDOF)
+			set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework 3DconnexionClient")
+			set(NDOF_INCLUDE_DIRS /Library/Frameworks/3DconnexionClient.framework/Headers )
 		endif()
+	endif()
 
 	if(WITH_JACK)
 		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework jackmp")
 	endif()
-
-	else()
-		set(PLATFORM_CFLAGS "-pipe -funsigned-char")
-		set(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
-		set(WITH_INPUT_NDOF OFF)  # unsupported
-	endif()
 	
 	if(WITH_PYTHON_MODULE OR WITH_PYTHON_FRAMEWORK)
 		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/Python")# force cmake to link right framework

Modified: branches/vgroup_modifiers/SConstruct
===================================================================
--- branches/vgroup_modifiers/SConstruct	2013-11-09 13:31:20 UTC (rev 61210)
+++ branches/vgroup_modifiers/SConstruct	2013-11-09 15:03:16 UTC (rev 61211)
@@ -285,18 +285,100 @@
     env['WITH_BF_CYCLES_CUDA_BINARIES'] = True
     env['WITH_BF_PYTHON'] = False
 
-# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY and JAckOSX detection for OSX
+
+#############################################################################
+###################    Automatic configuration for OSX     ##################
+#############################################################################
+
 if env['OURPLATFORM']=='darwin':
+
+    import commands
+
+    cmd = 'sw_vers -productVersion'
+    MAC_CUR_VER=cmd_res=commands.getoutput(cmd)
+    cmd = 'xcodebuild -version'
+    cmd_xcode=commands.getoutput(cmd)
+    env['XCODE_CUR_VER']=cmd_xcode[6:][:3] # truncate output to major.minor version
+    cmd = 'xcodebuild -showsdks'
+    cmd_sdk=commands.getoutput(cmd)
+    MACOSX_SDK_CHECK=cmd_sdk
+    cmd = 'xcode-select --print-path'
+    XCODE_SELECT_PATH=commands.getoutput(cmd)
+    if XCODE_SELECT_PATH.endswith("/Contents/Developer"):
+        XCODE_BUNDLE=XCODE_SELECT_PATH[:-19]
+    else:
+        XCODE_BUNDLE=XCODE_SELECT_PATH
+
     print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'] + " --"
-    print "Available " + env['MACOSX_SDK_CHECK']
-    if not 'Mac OS X 10.6' in env['MACOSX_SDK_CHECK']:
-        print  B.bc.OKGREEN + "Building with user-defined OS X SDK ( Xcode 4.4 or newer )"
-    elif not 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']:
-        print  B.bc.OKGREEN + "Auto-setting available MacOSX SDK -> " + B.bc.ENDC + "MacOSX10.6.sdk"
+    print B.bc.OKGREEN + "Available SDK's: \n" + B.bc.ENDC + MACOSX_SDK_CHECK.replace('\t', '')
+
+    if env['MACOSX_SDK'] == '': # no set sdk, choosing best one found
+        if 'OS X 10.9' in MACOSX_SDK_CHECK:
+            env['MACOSX_DEPLOYMENT_TARGET'] = '10.6'
+            env['MACOSX_SDK']='/Developer/SDKs/MacOSX10.9.sdk'
+        elif 'OS X 10.8' in MACOSX_SDK_CHECK:
+            env['MACOSX_DEPLOYMENT_TARGET'] = '10.6'
+            env['MACOSX_SDK']='/Developer/SDKs/MacOSX10.8.sdk'
+        elif 'OS X 10.7' in MACOSX_SDK_CHECK:
+            env['MACOSX_DEPLOYMENT_TARGET'] = '10.6'
+            env['MACOSX_SDK']='/Developer/SDKs/MacOSX10.7.sdk'

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list