[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61027] branches/vgroup_modifiers: svn merge -r 60858:61026 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Bastien Montagne
montagne29 at wanadoo.fr
Thu Oct 31 15:02:03 CET 2013
Revision: 61027
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61027
Author: mont29
Date: 2013-10-31 14:02:02 +0000 (Thu, 31 Oct 2013)
Log Message:
-----------
svn merge -r 60858:61026 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/vgroup_modifiers/CMakeLists.txt
branches/vgroup_modifiers/build_files/build_environment/install_deps.sh
branches/vgroup_modifiers/build_files/cmake/macros.cmake
branches/vgroup_modifiers/extern/bullet2/CMakeLists.txt
branches/vgroup_modifiers/extern/bullet2/readme.txt
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDispatcher.h
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCache.h
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionObject.h
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCollisionAlgorithm.h
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConcaveCollisionAlgorithm.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexConvexAlgorithm.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionShapes/btCompoundShape.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionShapes/btConeShape.h
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionShapes/btHeightfieldTerrainShape.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleMesh.h
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btConvexPenetrationDepthSolver.h
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btDiscreteCollisionDetectorInterface.h
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btMinkowskiPenetrationDepthSolver.h
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/Character/btCharacterControllerInterface.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/Character/btKinematicCharacterController.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConeTwistConstraint.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btConstraintSolver.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGearConstraint.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofSpringConstraint.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btHingeConstraint.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverBody.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSolverConstraint.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/Dynamics/btDynamicsWorld.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/Dynamics/btRigidBody.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/vgroup_modifiers/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
branches/vgroup_modifiers/extern/bullet2/src/LinearMath/btIDebugDraw.h
branches/vgroup_modifiers/extern/bullet2/src/LinearMath/btMatrix3x3.h
branches/vgroup_modifiers/extern/bullet2/src/LinearMath/btQuaternion.h
branches/vgroup_modifiers/extern/bullet2/src/LinearMath/btScalar.h
branches/vgroup_modifiers/extern/bullet2/src/LinearMath/btSerializer.cpp
branches/vgroup_modifiers/extern/bullet2/src/LinearMath/btSerializer.h
branches/vgroup_modifiers/extern/bullet2/src/LinearMath/btVector3.cpp
branches/vgroup_modifiers/extern/bullet2/src/LinearMath/btVector3.h
branches/vgroup_modifiers/extern/bullet2/src/SConscript
branches/vgroup_modifiers/extern/bullet2/src/btBulletDynamicsCommon.h
branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/bundle.cc
branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/modal_solver.cc
branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/tracks.cc
branches/vgroup_modifiers/extern/libmv/libmv/simple_pipeline/tracks.h
branches/vgroup_modifiers/extern/libmv/libmv/tracking/track_region.cc
branches/vgroup_modifiers/extern/libmv/libmv/tracking/track_region.h
branches/vgroup_modifiers/extern/libmv/libmv-capi.cc
branches/vgroup_modifiers/extern/libmv/libmv-capi.h
branches/vgroup_modifiers/extern/libmv/libmv-capi_stub.cc
branches/vgroup_modifiers/intern/CMakeLists.txt
branches/vgroup_modifiers/intern/bsp/intern/BOP_CarveInterface.cpp
branches/vgroup_modifiers/intern/cycles/app/cycles_standalone.cpp
branches/vgroup_modifiers/intern/cycles/blender/blender_shader.cpp
branches/vgroup_modifiers/intern/cycles/bvh/bvh_build.cpp
branches/vgroup_modifiers/intern/cycles/device/device_cpu.cpp
branches/vgroup_modifiers/intern/cycles/kernel/kernel_film.h
branches/vgroup_modifiers/intern/cycles/kernel/shaders/node_math.osl
branches/vgroup_modifiers/intern/cycles/render/graph.h
branches/vgroup_modifiers/intern/cycles/render/nodes.cpp
branches/vgroup_modifiers/intern/cycles/render/shader.cpp
branches/vgroup_modifiers/intern/cycles/util/util_task.cpp
branches/vgroup_modifiers/intern/cycles/util/util_task.h
branches/vgroup_modifiers/intern/ghost/CMakeLists.txt
branches/vgroup_modifiers/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/vgroup_modifiers/intern/ghost/test/CMakeLists.txt
branches/vgroup_modifiers/intern/guardedalloc/intern/mallocn_lockfree_impl.c
branches/vgroup_modifiers/intern/rigidbody/CMakeLists.txt
branches/vgroup_modifiers/intern/rigidbody/rb_bullet_api.cpp
branches/vgroup_modifiers/release/bin/blender-softwaregl
branches/vgroup_modifiers/release/datafiles/splash.png
branches/vgroup_modifiers/release/scripts/modules/addon_utils.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/presets/keyconfig/maya.py
branches/vgroup_modifiers/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_clip.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_graph.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_time.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d.py
branches/vgroup_modifiers/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/vgroup_modifiers/release/scripts/templates_py/operator_modal_timer.py
branches/vgroup_modifiers/source/blender/blenkernel/BKE_action.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_animsys.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_editmesh.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_global.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_texture.h
branches/vgroup_modifiers/source/blender/blenkernel/BKE_tracking.h
branches/vgroup_modifiers/source/blender/blenkernel/intern/action.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/anim_sys.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/editderivedmesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/editmesh.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/font.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/image.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/mask.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/mesh_evaluate.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/object.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/particle_system.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/scene.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/sequencer.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/shrinkwrap.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/smoke.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/texture.c
branches/vgroup_modifiers/source/blender/blenkernel/intern/tracking.c
branches/vgroup_modifiers/source/blender/blenlib/BLI_math_matrix.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_math_vector.h
branches/vgroup_modifiers/source/blender/blenlib/BLI_task.h
branches/vgroup_modifiers/source/blender/blenlib/intern/BLI_mempool.c
branches/vgroup_modifiers/source/blender/blenlib/intern/math_matrix.c
branches/vgroup_modifiers/source/blender/blenlib/intern/math_rotation.c
branches/vgroup_modifiers/source/blender/blenlib/intern/math_vector_inline.c
branches/vgroup_modifiers/source/blender/blenlib/intern/task.c
branches/vgroup_modifiers/source/blender/blenlib/intern/threads.c
branches/vgroup_modifiers/source/blender/blenloader/intern/readfile.c
branches/vgroup_modifiers/source/blender/bmesh/bmesh_class.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_core.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_mesh.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_mesh.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_mods.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_opdefines.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_polygon.c
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_polygon.h
branches/vgroup_modifiers/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_fill_grid.c
branches/vgroup_modifiers/source/blender/bmesh/operators/bmo_triangulate.c
branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_beautify.c
branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_beautify.h
branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_triangulate.c
branches/vgroup_modifiers/source/blender/bmesh/tools/bmesh_triangulate.h
branches/vgroup_modifiers/source/blender/collada/collada_utils.cpp
branches/vgroup_modifiers/source/blender/compositor/CMakeLists.txt
branches/vgroup_modifiers/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/vgroup_modifiers/source/blender/compositor/nodes/COM_BlurNode.cpp
branches/vgroup_modifiers/source/blender/compositor/nodes/COM_ImageNode.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_FastGaussianBlurOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_FastGaussianBlurOperation.h
branches/vgroup_modifiers/source/blender/compositor/operations/COM_MaskOperation.cpp
branches/vgroup_modifiers/source/blender/compositor/operations/COM_RenderLayersProg.cpp
branches/vgroup_modifiers/source/blender/editors/animation/anim_channels_edit.c
branches/vgroup_modifiers/source/blender/editors/animation/anim_draw.c
branches/vgroup_modifiers/source/blender/editors/animation/anim_filter.c
branches/vgroup_modifiers/source/blender/editors/animation/anim_markers.c
branches/vgroup_modifiers/source/blender/editors/animation/keyframing.c
branches/vgroup_modifiers/source/blender/editors/armature/armature_add.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_naming.c
branches/vgroup_modifiers/source/blender/editors/armature/armature_ops.c
branches/vgroup_modifiers/source/blender/editors/armature/editarmature_sketch.c
branches/vgroup_modifiers/source/blender/editors/armature/pose_lib.c
branches/vgroup_modifiers/source/blender/editors/armature/pose_slide.c
branches/vgroup_modifiers/source/blender/editors/curve/editcurve.c
branches/vgroup_modifiers/source/blender/editors/curve/editfont.c
branches/vgroup_modifiers/source/blender/editors/gpencil/gpencil_edit.c
branches/vgroup_modifiers/source/blender/editors/gpencil/gpencil_paint.c
branches/vgroup_modifiers/source/blender/editors/include/ED_anim_api.h
branches/vgroup_modifiers/source/blender/editors/include/ED_mball.h
branches/vgroup_modifiers/source/blender/editors/include/ED_mesh.h
branches/vgroup_modifiers/source/blender/editors/include/ED_numinput.h
branches/vgroup_modifiers/source/blender/editors/include/ED_sculpt.h
branches/vgroup_modifiers/source/blender/editors/include/ED_transform.h
branches/vgroup_modifiers/source/blender/editors/include/ED_view3d.h
branches/vgroup_modifiers/source/blender/editors/interface/interface.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_eyedropper.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_handlers.c
branches/vgroup_modifiers/source/blender/editors/interface/interface_widgets.c
branches/vgroup_modifiers/source/blender/editors/interface/view2d_ops.c
branches/vgroup_modifiers/source/blender/editors/mask/mask_add.c
branches/vgroup_modifiers/source/blender/editors/mask/mask_shapekey.c
branches/vgroup_modifiers/source/blender/editors/mesh/editface.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_bevel.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_bisect.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_extrude.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_inset.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_knife.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_loopcut.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_select.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_tools.c
branches/vgroup_modifiers/source/blender/editors/mesh/editmesh_utils.c
branches/vgroup_modifiers/source/blender/editors/mesh/mesh_navmesh.c
branches/vgroup_modifiers/source/blender/editors/mesh/mesh_ops.c
branches/vgroup_modifiers/source/blender/editors/mesh/meshtools.c
branches/vgroup_modifiers/source/blender/editors/metaball/mball_edit.c
branches/vgroup_modifiers/source/blender/editors/metaball/mball_intern.h
branches/vgroup_modifiers/source/blender/editors/metaball/mball_ops.c
branches/vgroup_modifiers/source/blender/editors/object/object_add.c
branches/vgroup_modifiers/source/blender/editors/object/object_bake.c
branches/vgroup_modifiers/source/blender/editors/object/object_transform.c
branches/vgroup_modifiers/source/blender/editors/object/object_vgroup.c
branches/vgroup_modifiers/source/blender/editors/physics/particle_edit.c
branches/vgroup_modifiers/source/blender/editors/render/render_internal.c
branches/vgroup_modifiers/source/blender/editors/render/render_opengl.c
branches/vgroup_modifiers/source/blender/editors/screen/screen_ops.c
branches/vgroup_modifiers/source/blender/editors/screen/screendump.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_intern.h
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_stroke.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/paint_vertex.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/sculpt.c
branches/vgroup_modifiers/source/blender/editors/sculpt_paint/sculpt_uv.c
branches/vgroup_modifiers/source/blender/editors/sound/sound_ops.c
branches/vgroup_modifiers/source/blender/editors/space_action/action_ops.c
branches/vgroup_modifiers/source/blender/editors/space_action/action_select.c
branches/vgroup_modifiers/source/blender/editors/space_api/spacetypes.c
branches/vgroup_modifiers/source/blender/editors/space_buttons/buttons_ops.c
branches/vgroup_modifiers/source/blender/editors/space_clip/clip_graph_draw.c
branches/vgroup_modifiers/source/blender/editors/space_clip/clip_ops.c
branches/vgroup_modifiers/source/blender/editors/space_clip/clip_utils.c
branches/vgroup_modifiers/source/blender/editors/space_clip/tracking_ops.c
branches/vgroup_modifiers/source/blender/editors/space_console/console_ops.c
branches/vgroup_modifiers/source/blender/editors/space_file/fsmenu.c
branches/vgroup_modifiers/source/blender/editors/space_graph/graph_draw.c
branches/vgroup_modifiers/source/blender/editors/space_graph/graph_edit.c
branches/vgroup_modifiers/source/blender/editors/space_graph/graph_ops.c
branches/vgroup_modifiers/source/blender/editors/space_graph/graph_select.c
branches/vgroup_modifiers/source/blender/editors/space_image/image_ops.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_edit.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_relationships.c
branches/vgroup_modifiers/source/blender/editors/space_node/node_view.c
branches/vgroup_modifiers/source/blender/editors/space_sequencer/sequencer_view.c
branches/vgroup_modifiers/source/blender/editors/space_text/space_text.c
branches/vgroup_modifiers/source/blender/editors/space_text/text_autocomplete.c
branches/vgroup_modifiers/source/blender/editors/space_text/text_ops.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/drawmesh.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/drawobject.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_draw.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_edit.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_fly.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_header.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_iterators.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_ruler.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_select.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_snap.c
branches/vgroup_modifiers/source/blender/editors/space_view3d/view3d_view.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_generics.c
branches/vgroup_modifiers/source/blender/editors/transform/transform_input.c
branches/vgroup_modifiers/source/blender/editors/transform/transform_manipulator.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/editors/util/numinput.c
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_ops.c
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/vgroup_modifiers/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/vgroup_modifiers/source/blender/freestyle/intern/geometry/Noise.cpp
branches/vgroup_modifiers/source/blender/freestyle/intern/python/BPy_Freestyle.cpp
branches/vgroup_modifiers/source/blender/imbuf/intern/oiio/openimageio_api.cpp
branches/vgroup_modifiers/source/blender/imbuf/intern/util.c
branches/vgroup_modifiers/source/blender/makesdna/DNA_anim_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_modifier_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_space_types.h
branches/vgroup_modifiers/source/blender/makesdna/DNA_tracking_types.h
branches/vgroup_modifiers/source/blender/makesrna/RNA_enum_types.h
branches/vgroup_modifiers/source/blender/makesrna/intern/makesrna.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_curve.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_mask.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_modifier.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_render.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_scene.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_sculpt_paint.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_wm.c
branches/vgroup_modifiers/source/blender/makesrna/intern/rna_wm_api.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_decimate.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_displace.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_mask.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_triangulate.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_util.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_util.h
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_warp.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_wave.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/vgroup_modifiers/source/blender/nodes/composite/nodes/node_composite_switch.c
branches/vgroup_modifiers/source/blender/nodes/intern/node_exec.c
branches/vgroup_modifiers/source/blender/nodes/intern/node_exec.h
branches/vgroup_modifiers/source/blender/nodes/shader/nodes/node_shader_common.c
branches/vgroup_modifiers/source/blender/nodes/texture/nodes/node_texture_common.c
branches/vgroup_modifiers/source/blender/python/bmesh/bmesh_py_types.c
branches/vgroup_modifiers/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/vgroup_modifiers/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/vgroup_modifiers/source/blender/python/bmesh/bmesh_py_types_meshdata.h
branches/vgroup_modifiers/source/blender/python/intern/bpy_app_ffmpeg.c
branches/vgroup_modifiers/source/blender/render/CMakeLists.txt
branches/vgroup_modifiers/source/blender/render/intern/source/convertblender.c
branches/vgroup_modifiers/source/blender/render/intern/source/initrender.c
branches/vgroup_modifiers/source/blender/render/intern/source/multires_bake.c
branches/vgroup_modifiers/source/blender/render/intern/source/pipeline.c
branches/vgroup_modifiers/source/blender/render/intern/source/sss.c
branches/vgroup_modifiers/source/blender/windowmanager/WM_api.h
branches/vgroup_modifiers/source/blender/windowmanager/WM_types.h
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_gesture.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_keymap.c
branches/vgroup_modifiers/source/blender/windowmanager/intern/wm_operators.c
branches/vgroup_modifiers/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/vgroup_modifiers/source/gameengine/Converter/CMakeLists.txt
Added Paths:
-----------
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/ConstraintSolver/btFixedConstraint.h
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/Featherstone/
branches/vgroup_modifiers/extern/bullet2/src/BulletDynamics/MLCPSolvers/
branches/vgroup_modifiers/extern/bullet2/src/LinearMath/btMatrixX.h
branches/vgroup_modifiers/release/darwin/README_codesigning.txt
branches/vgroup_modifiers/release/darwin/codesigning_rules_blender.plist
branches/vgroup_modifiers/release/darwin/codesigning_rules_player.plist
branches/vgroup_modifiers/release/scripts/templates_py/operator_mesh_uv.py
Removed Paths:
-------------
branches/vgroup_modifiers/extern/bullet2/patches/ghost_character.patch
branches/vgroup_modifiers/release/scripts/templates_py/operator_uv.py
Property Changed:
----------------
branches/vgroup_modifiers/
branches/vgroup_modifiers/source/blender/editors/interface/interface.c
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:60311
/tags/blender-2.67b-release/blender:57122
/trunk/blender:38694-38739,38741-39198,39200-39651,39653-39988,39990-43541,43543-60858
+ /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-61026
Modified: branches/vgroup_modifiers/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/CMakeLists.txt 2013-10-31 13:11:01 UTC (rev 61026)
+++ branches/vgroup_modifiers/CMakeLists.txt 2013-10-31 14:02:02 UTC (rev 61027)
@@ -1805,13 +1805,9 @@
set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
endif()
- if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- if(${CMAKE_GENERATOR} MATCHES "Xcode")
- if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
- # Xcode 5 has too low template depth of 128 for libmv
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
- endif()
- endif()
+ if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
+ # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
endif()
endif()
Modified: branches/vgroup_modifiers/build_files/build_environment/install_deps.sh
===================================================================
--- branches/vgroup_modifiers/build_files/build_environment/install_deps.sh 2013-10-31 13:11:01 UTC (rev 61026)
+++ branches/vgroup_modifiers/build_files/build_environment/install_deps.sh 2013-10-31 14:02:02 UTC (rev 61027)
@@ -200,10 +200,10 @@
OCIO_FORCE_REBUILD=false
OCIO_SKIP=false
-OPENEXR_VERSION="2.0.0"
+OPENEXR_VERSION="2.0.1"
OPENEXR_SOURCE="http://download.savannah.nongnu.org/releases/openexr/openexr-$OPENEXR_VERSION.tar.gz"
OPENEXR_VERSION_MIN="2.0"
-ILMBASE_VERSION="2.0.0"
+ILMBASE_VERSION="2.0.1"
ILMBASE_SOURCE="http://download.savannah.nongnu.org/releases/openexr/ilmbase-$ILMBASE_VERSION.tar.gz"
OPENEXR_FORCE_REBUILD=false
OPENEXR_SKIP=false
@@ -855,7 +855,7 @@
compile_ILMBASE() {
# To be changed each time we make edits that would modify the compiled result!
- ilmbase_magic=5
+ ilmbase_magic=6
_init_ilmbase
# Clean install if needed!
@@ -958,7 +958,7 @@
compile_OPENEXR() {
# To be changed each time we make edits that would modify the compiled result!
- openexr_magic=10
+ openexr_magic=11
# Clean install if needed!
magic_compile_check openexr-$OPENEXR_VERSION $openexr_magic
@@ -1033,12 +1033,13 @@
TARGET_LINK_LIBRARIES ( IlmImfFuzzTest IlmImf Iex Imath Half IlmThread ${PTHREAD_LIB} ${Z_LIB})
--- a/IlmImfTest/CMakeLists.txt
+++ b/IlmImfTest/CMakeLists.txt
-@@ -19,22 +19,26 @@
+@@ -19,22 +19,28 @@
testCustomAttributes.cpp
testDeepScanLineBasic.cpp
testDeepScanLineHuge.cpp
+ testDeepScanLineMultipleRead.cpp
testDeepTiledBasic.cpp
++ testBadTypeAttributes.cpp
testExistingStreams.cpp
+ testFutureProofing.cpp
testHuf.cpp
@@ -1056,6 +1057,7 @@
testMultiView.cpp
testNativeFormat.cpp
+ testOptimized.cpp
++ testOptimizedInterleavePatterns.cpp
+ testPartHelper.cpp
testPreviewImage.cpp
testRgba.cpp
@@ -1089,11 +1091,12 @@
DESTINATION
\${CMAKE_INSTALL_PREFIX}/lib
)
-@@ -168,6 +167,7 @@
+@@ -168,6 +167,8 @@
INSTALL ( FILES
${CMAKE_SOURCE_DIR}/config/OpenEXRConfig.h
ImfForward.h
+ ImfNamespace.h
++ ImfPartHelper.h
ImfExport.h
ImfAttribute.h
ImfBoxAttribute.h
Modified: branches/vgroup_modifiers/build_files/cmake/macros.cmake
===================================================================
--- branches/vgroup_modifiers/build_files/cmake/macros.cmake 2013-10-31 13:11:01 UTC (rev 61026)
+++ branches/vgroup_modifiers/build_files/cmake/macros.cmake 2013-10-31 14:02:02 UTC (rev 61027)
@@ -48,6 +48,24 @@
unset(_index)
endmacro()
+function (list_assert_duplicates
+ list_id
+ )
+
+ # message(STATUS "list data: ${list_id}")
+
+ list(LENGTH list_id _len_before)
+ list(REMOVE_DUPLICATES list_id)
+ list(LENGTH list_id _len_after)
+ # message(STATUS "list size ${_len_before} -> ${_len_after}")
+ if(NOT _len_before EQUAL _len_after)
+ message(FATAL_ERROR "duplicate found in list which should not contain duplicates: ${list_id}")
+ endif()
+ unset(_len_before)
+ unset(_len_after)
+endfunction()
+
+
# foo_bar.spam --> foo_barMySuffix.spam
macro(file_suffix
file_name_new file_name file_suffix
@@ -177,6 +195,11 @@
# listed is helpful for IDE's (QtCreator/MSVC)
blender_source_group("${sources}")
+ list_assert_duplicates("${sources}")
+ list_assert_duplicates("${includes}")
+ # Not for system includes because they can resolve to the same path
+ # list_assert_duplicates("${includes_sys}")
+
endmacro()
Modified: branches/vgroup_modifiers/extern/bullet2/CMakeLists.txt
===================================================================
--- branches/vgroup_modifiers/extern/bullet2/CMakeLists.txt 2013-10-31 13:11:01 UTC (rev 61026)
+++ branches/vgroup_modifiers/extern/bullet2/CMakeLists.txt 2013-10-31 14:02:02 UTC (rev 61027)
@@ -67,6 +67,8 @@
src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.cpp
src/BulletCollision/CollisionDispatch/btUnionFind.cpp
src/BulletCollision/CollisionDispatch/SphereTriangleDetector.cpp
+ src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.cpp
+ src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.cpp
src/BulletCollision/CollisionShapes/btBoxShape.cpp
src/BulletCollision/CollisionShapes/btBox2dShape.cpp
src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.cpp
@@ -140,6 +142,7 @@
src/BulletDynamics/ConstraintSolver/btTypedConstraint.cpp
src/BulletDynamics/ConstraintSolver/btUniversalConstraint.cpp
src/BulletDynamics/ConstraintSolver/btGearConstraint.cpp
+ src/BulletDynamics/ConstraintSolver/btFixedConstraint.cpp
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
src/BulletDynamics/Dynamics/btRigidBody.cpp
src/BulletDynamics/Dynamics/btSimpleDynamicsWorld.cpp
@@ -147,6 +150,15 @@
src/BulletDynamics/Vehicle/btRaycastVehicle.cpp
src/BulletDynamics/Vehicle/btWheelInfo.cpp
src/BulletDynamics/Character/btKinematicCharacterController.cpp
+ src/BulletDynamics/Featherstone/btMultiBody.cpp
+ src/BulletDynamics/Featherstone/btMultiBodyConstraint.cpp
+ src/BulletDynamics/Featherstone/btMultiBodyConstraintSolver.cpp
+ src/BulletDynamics/Featherstone/btMultiBodyDynamicsWorld.cpp
+ src/BulletDynamics/Featherstone/btMultiBodyJointLimitConstraint.cpp
+ src/BulletDynamics/Featherstone/btMultiBodyJointMotor.cpp
+ src/BulletDynamics/Featherstone/btMultiBodyPoint2Point.cpp
+ src/BulletDynamics/MLCPSolvers/btDantzigLCP.cpp
+ src/BulletDynamics/MLCPSolvers/btMLCPSolver.cpp
src/BulletSoftBody/btSoftBody.cpp
src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
@@ -204,6 +216,8 @@
src/BulletCollision/CollisionDispatch/btSphereTriangleCollisionAlgorithm.h
src/BulletCollision/CollisionDispatch/btUnionFind.h
src/BulletCollision/CollisionDispatch/SphereTriangleDetector.h
+ src/BulletCollision/CollisionDispatch/btCompoundCompoundCollisionAlgorithm.h
+ src/BulletCollision/CollisionDispatch/btHashedSimplePairCache.h
src/BulletCollision/CollisionShapes/btBoxShape.h
src/BulletCollision/CollisionShapes/btBox2dShape.h
src/BulletCollision/CollisionShapes/btBvhTriangleMeshShape.h
@@ -308,6 +322,7 @@
src/BulletDynamics/ConstraintSolver/btTypedConstraint.h
src/BulletDynamics/ConstraintSolver/btUniversalConstraint.h
src/BulletDynamics/ConstraintSolver/btGearConstraint.h
+ src/BulletDynamics/ConstraintSolver/btFixedConstraint.h
src/BulletDynamics/Dynamics/btActionInterface.h
src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h
src/BulletDynamics/Dynamics/btDynamicsWorld.h
@@ -318,6 +333,22 @@
src/BulletDynamics/Vehicle/btWheelInfo.h
src/BulletDynamics/Character/btCharacterControllerInterface.h
src/BulletDynamics/Character/btKinematicCharacterController.h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list