Revision: 23483
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23483
Author: campbellbarton
Date: 2009-09-25 12:59:36 +0200 (Fri, 25 Sep 2009)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r23200:23300
Modified Paths:
--------------
branches/ge_dyn_load/CMakeLists.txt
branches/ge_dyn_load/extern/bullet2/src/Bullet-C-Api.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
branches/ge_dyn_load/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
branches/ge_dyn_load/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletDynamics/Dynamics/btActionInterface.h
branches/ge_dyn_load/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/Jamfile
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
branches/ge_dyn_load/extern/bullet2/src/LinearMath/btConvexHull.cpp
branches/ge_dyn_load/extern/bullet2/src/LinearMath/btConvexHull.h
branches/ge_dyn_load/extern/bullet2/src/LinearMath/btHashMap.h
branches/ge_dyn_load/extern/bullet2/src/LinearMath/btPoolAllocator.h
branches/ge_dyn_load/extern/glew/README.txt
branches/ge_dyn_load/extern/glew/doc/glew.css
branches/ge_dyn_load/extern/glew/doc/glx.txt
branches/ge_dyn_load/extern/glew/doc/gpl.txt
branches/ge_dyn_load/extern/glew/doc/sgi.txt
branches/ge_dyn_load/extern/lzma/Alloc.c
branches/ge_dyn_load/extern/lzma/Alloc.h
branches/ge_dyn_load/extern/lzma/CMakeLists.txt
branches/ge_dyn_load/extern/lzma/LzFind.c
branches/ge_dyn_load/extern/lzma/LzFind.h
branches/ge_dyn_load/extern/lzma/LzHash.h
branches/ge_dyn_load/extern/lzma/LzmaDec.c
branches/ge_dyn_load/extern/lzma/LzmaDec.h
branches/ge_dyn_load/extern/lzma/LzmaEnc.c
branches/ge_dyn_load/extern/lzma/LzmaEnc.h
branches/ge_dyn_load/extern/lzma/LzmaLib.c
branches/ge_dyn_load/extern/lzma/LzmaLib.h
branches/ge_dyn_load/extern/lzma/history.txt
branches/ge_dyn_load/extern/lzma/lzma.txt
branches/ge_dyn_load/extern/lzo/CMakeLists.txt
branches/ge_dyn_load/extern/lzo/minilzo/minilzo.h
branches/ge_dyn_load/extern/xvidcore/src/image/qpel.c
branches/ge_dyn_load/intern/ghost/GHOST_Types.h
branches/ge_dyn_load/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/ge_dyn_load/intern/ghost/intern/GHOST_SystemX11.cpp
branches/ge_dyn_load/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/ge_dyn_load/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/ge_dyn_load/intern/ghost/intern/GHOST_WindowX11.cpp
branches/ge_dyn_load/po/Makefile
branches/ge_dyn_load/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/ge_dyn_load/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/ge_dyn_load/release/io/engine_render_pov.py
branches/ge_dyn_load/release/io/export_ply.py
branches/ge_dyn_load/release/ui/bpy_ops.py
branches/ge_dyn_load/release/ui/buttons_data_lamp.py
branches/ge_dyn_load/release/ui/buttons_data_mesh.py
branches/ge_dyn_load/release/ui/buttons_material.py
branches/ge_dyn_load/release/ui/buttons_object.py
branches/ge_dyn_load/release/ui/buttons_physics_field.py
branches/ge_dyn_load/release/ui/buttons_scene.py
branches/ge_dyn_load/release/ui/buttons_texture.py
branches/ge_dyn_load/release/ui/space_image.py
branches/ge_dyn_load/release/ui/space_info.py
branches/ge_dyn_load/release/ui/space_node.py
branches/ge_dyn_load/release/ui/space_userpref.py
branches/ge_dyn_load/release/ui/space_view3d.py
branches/ge_dyn_load/release/ui/space_view3d_toolbar.py
branches/ge_dyn_load/source/blender/blenfont/intern/blf.c
branches/ge_dyn_load/source/blender/blenfont/intern/blf_dir.c
branches/ge_dyn_load/source/blender/blenfont/intern/blf_font.c
branches/ge_dyn_load/source/blender/blenfont/intern/blf_glyph.c
branches/ge_dyn_load/source/blender/blenkernel/BKE_action.h
branches/ge_dyn_load/source/blender/blenkernel/BKE_depsgraph.h
branches/ge_dyn_load/source/blender/blenkernel/BKE_node.h
branches/ge_dyn_load/source/blender/blenkernel/BKE_screen.h
branches/ge_dyn_load/source/blender/blenkernel/BKE_text.h
branches/ge_dyn_load/source/blender/blenkernel/intern/action.c
branches/ge_dyn_load/source/blender/blenkernel/intern/anim_sys.c
branches/ge_dyn_load/source/blender/blenkernel/intern/brush.c
branches/ge_dyn_load/source/blender/blenkernel/intern/cloth.c
branches/ge_dyn_load/source/blender/blenkernel/intern/collision.c
branches/ge_dyn_load/source/blender/blenkernel/intern/curve.c
branches/ge_dyn_load/source/blender/blenkernel/intern/depsgraph.c
branches/ge_dyn_load/source/blender/blenkernel/intern/displist.c
branches/ge_dyn_load/source/blender/blenkernel/intern/fcurve.c
branches/ge_dyn_load/source/blender/blenkernel/intern/fluidsim.c
branches/ge_dyn_load/source/blender/blenkernel/intern/font.c
branches/ge_dyn_load/source/blender/blenkernel/intern/image.c
branches/ge_dyn_load/source/blender/blenkernel/intern/implicit.c
branches/ge_dyn_load/source/blender/blenkernel/intern/ipo.c
branches/ge_dyn_load/source/blender/blenkernel/intern/library.c
branches/ge_dyn_load/source/blender/blenkernel/intern/material.c
branches/ge_dyn_load/source/blender/blenkernel/intern/modifier.c
branches/ge_dyn_load/source/blender/blenkernel/intern/multires.c
branches/ge_dyn_load/source/blender/blenkernel/intern/nla.c
branches/ge_dyn_load/source/blender/blenkernel/intern/object.c
branches/ge_dyn_load/source/blender/blenkernel/intern/packedFile.c
branches/ge_dyn_load/source/blender/blenkernel/intern/paint.c
branches/ge_dyn_load/source/blender/blenkernel/intern/particle_system.c
branches/ge_dyn_load/source/blender/blenkernel/intern/pointcache.c
branches/ge_dyn_load/source/blender/blenkernel/intern/screen.c
branches/ge_dyn_load/source/blender/blenkernel/intern/sequence.c
branches/ge_dyn_load/source/blender/blenkernel/intern/smoke.c
branches/ge_dyn_load/source/blender/blenkernel/intern/text.c
branches/ge_dyn_load/source/blender/blenkernel/intern/writeffmpeg.c
branches/ge_dyn_load/source/blender/blenlib/BLI_listbase.h
branches/ge_dyn_load/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/ge_dyn_load/source/blender/blenlib/intern/BLI_kdtree.c
branches/ge_dyn_load/source/blender/blenlib/intern/arithb.c
branches/ge_dyn_load/source/blender/blenlib/intern/freetypefont.c
branches/ge_dyn_load/source/blender/blenlib/intern/graph.c
branches/ge_dyn_load/source/blender/blenlib/intern/listbase.c
branches/ge_dyn_load/source/blender/blenlib/intern/noise.c
branches/ge_dyn_load/source/blender/blenlib/intern/threads.c
branches/ge_dyn_load/source/blender/blenloader/intern/readblenentry.c
branches/ge_dyn_load/source/blender/blenloader/intern/readfile.c
branches/ge_dyn_load/source/blender/editors/animation/anim_deps.c
branches/ge_dyn_load/source/blender/editors/armature/editarmature_retarget.c
branches/ge_dyn_load/source/blender/editors/datafiles/B.blend.c
branches/ge_dyn_load/source/blender/editors/include/ED_datafiles.h
branches/ge_dyn_load/source/blender/editors/include/ED_image.h
branches/ge_dyn_load/source/blender/editors/include/ED_node.h
branches/ge_dyn_load/source/blender/editors/include/ED_screen.h
branches/ge_dyn_load/source/blender/editors/include/UI_interface.h
branches/ge_dyn_load/source/blender/editors/interface/interface.c
branches/ge_dyn_load/source/blender/editors/interface/interface_handlers.c
branches/ge_dyn_load/source/blender/editors/interface/interface_intern.h
branches/ge_dyn_load/source/blender/editors/interface/interface_layout.c
branches/ge_dyn_load/source/blender/editors/interface/interface_panel.c
branches/ge_dyn_load/source/blender/editors/interface/interface_regions.c
branches/ge_dyn_load/source/blender/editors/interface/interface_templates.c
branches/ge_dyn_load/source/blender/editors/interface/interface_utils.c
branches/ge_dyn_load/source/blender/editors/interface/interface_widgets.c
branches/ge_dyn_load/source/blender/editors/mesh/editmesh_loop.c
branches/ge_dyn_load/source/blender/editors/mesh/editmesh_tools.c
branches/ge_dyn_load/source/blender/editors/mesh/loopcut.c
branches/ge_dyn_load/source/blender/editors/mesh/mesh_intern.h
branches/ge_dyn_load/source/blender/editors/mesh/mesh_ops.c
branches/ge_dyn_load/source/blender/editors/metaball/mball_ops.c
branches/ge_dyn_load/source/blender/editors/object/object_edit.c
branches/ge_dyn_load/source/blender/editors/object/object_intern.h
branches/ge_dyn_load/source/blender/editors/object/object_ops.c
branches/ge_dyn_load/source/blender/editors/preview/previewrender.c
branches/ge_dyn_load/source/blender/editors/screen/area.c
branches/ge_dyn_load/source/blender/editors/screen/screen_edit.c
branches/ge_dyn_load/source/blender/editors/screen/screen_ops.c
branches/ge_dyn_load/source/blender/editors/sculpt_paint/paint_vertex.c
branches/ge_dyn_load/source/blender/editors/space_action/action_edit.c
branches/ge_dyn_load/source/blender/editors/space_action/action_header.c
branches/ge_dyn_load/source/blender/editors/space_action/action_intern.h
branches/ge_dyn_load/source/blender/editors/space_action/action_ops.c
branches/ge_dyn_load/source/blender/editors/space_buttons/space_buttons.c
branches/ge_dyn_load/source/blender/editors/space_file/file_ops.c
branches/ge_dyn_load/source/blender/editors/space_file/filelist.c
branches/ge_dyn_load/source/blender/editors/space_file/filesel.c
branches/ge_dyn_load/source/blender/editors/space_file/space_file.c
branches/ge_dyn_load/source/blender/editors/space_graph/graph_buttons.c
branches/ge_dyn_load/source/blender/editors/space_image/image_buttons.c
branches/ge_dyn_load/source/blender/editors/space_image/image_ops.c
branches/ge_dyn_load/source/blender/editors/space_logic/logic_buttons.c
branches/ge_dyn_load/source/blender/editors/space_logic/logic_window.c
branches/ge_dyn_load/source/blender/editors/space_nla/nla_buttons.c
branches/ge_dyn_load/source/blender/editors/space_node/drawnode.c
branches/ge_dyn_load/source/blender/editors/space_node/node_draw.c
branches/ge_dyn_load/source/blender/editors/space_node/node_edit.c
branches/ge_dyn_load/source/blender/editors/space_node/node_intern.h
branches/ge_dyn_load/source/blender/editors/space_node/node_ops.c
branches/ge_dyn_load/source/blender/editors/space_node/node_select.c
branches/ge_dyn_load/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/ge_dyn_load/source/blender/editors/space_text/text_header.c
branches/ge_dyn_load/source/blender/editors/space_view3d/drawobject.c
branches/ge_dyn_load/source/blender/editors/space_view3d/drawvolume.c
branches/ge_dyn_load/source/blender/editors/space_view3d/space_view3d.c
branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_buttons.c
branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_draw.c
branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_ops.c
branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_select.c
branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_snap.c
branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_toolbar.c
branches/ge_dyn_load/source/blender/editors/transform/transform_ops.c
branches/ge_dyn_load/source/blender/editors/uvedit/uvedit_ops.c
branches/ge_dyn_load/source/blender/gpu/intern/gpu_extensions.c
branches/ge_dyn_load/source/blender/makesdna/DNA_ID.h
branches/ge_dyn_load/source/blender/makesdna/DNA_modifier_types.h
branches/ge_dyn_load/source/blender/makesdna/DNA_node_types.h
branches/ge_dyn_load/source/blender/makesdna/DNA_object_fluidsim.h
branches/ge_dyn_load/source/blender/makesdna/DNA_windowmanager_types.h
branches/ge_dyn_load/source/blender/makesrna/RNA_access.h
branches/ge_dyn_load/source/blender/makesrna/RNA_types.h
branches/ge_dyn_load/source/blender/makesrna/intern/makesrna.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_access.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_action.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_animation.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_armature.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_brush.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_color.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_constraint.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_curve.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_define.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_fcurve.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_fluidsim.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_gpencil.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_group.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_image.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_internal.h
branches/ge_dyn_load/source/blender/makesrna/intern/rna_key.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_lamp.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_main.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_main_api.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_material.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_meta.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_modifier.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_nla.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_nodetree.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_object.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_object_api.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_particle.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_pose.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_rna.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_scene.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_screen.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_sensor.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_sequence.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_smoke.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_space.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_text.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_texture.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_ui_api.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_userdef.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_wm.c
branches/ge_dyn_load/source/blender/makesrna/intern/rna_world.c
branches/ge_dyn_load/source/blender/python/epy_doc_gen.py
branches/ge_dyn_load/source/blender/python/generic/Mathutils.c
branches/ge_dyn_load/source/blender/python/intern/bpy_operator.c
branches/ge_dyn_load/source/blender/python/intern/bpy_rna.c
branches/ge_dyn_load/source/blender/render/intern/source/pipeline.c
branches/ge_dyn_load/source/blender/render/intern/source/sss.c
branches/ge_dyn_load/source/blender/render/intern/source/voxeldata.c
branches/ge_dyn_load/source/blender/windowmanager/WM_types.h
branches/ge_dyn_load/source/blender/windowmanager/intern/wm.c
branches/ge_dyn_load/source/blender/windowmanager/intern/wm_event_system.c
branches/ge_dyn_load/source/blender/windowmanager/intern/wm_operators.c
branches/ge_dyn_load/source/blender/windowmanager/wm_event_types.h
branches/ge_dyn_load/source/nan_definitions.mk
Removed Paths:
-------------
branches/ge_dyn_load/release/datafiles/splash.jpg
branches/ge_dyn_load/source/blender/editors/datafiles/splash.jpg.c
Property Changed:
----------------
branches/ge_dyn_load/
branches/ge_dyn_load/extern/bullet2/src/Bullet-C-Api.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvt.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btDbvtBroadphase.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btMultiSapBroadphase.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btOverlappingPairCallback.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxCollisionAlgorithm.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btBoxBoxDetector.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionConfiguration.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btConvexPlaneCollisionAlgorithm.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionDispatch/btGhostObject.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexInternalShape.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexPointCloudShape.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btMaterial.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btMultimaterialTriangleMeshShape.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btScaledBvhTriangleMeshShape.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btShapeHull.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btTriangleIndexVertexMaterialArray.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/CollisionShapes/btUniformScalingShape.h
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/Gimpact/btContactProcessing.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/Gimpact/gim_box_set.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/Gimpact/gim_contact.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/Gimpact/gim_memory.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btGjkEpa2.h
branches/ge_dyn_load/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
branches/ge_dyn_load/extern/bullet2/src/BulletDynamics/Dynamics/Bullet-C-API.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletDynamics/Dynamics/btActionInterface.h
branches/ge_dyn_load/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletDynamics/Dynamics/btContinuousDynamicsWorld.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/CMakeLists.txt
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/Jamfile
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBody.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBody.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBodyInternals.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftRigidCollisionAlgorithm.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftRigidDynamicsWorld.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.cpp
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSoftSoftCollisionAlgorithm.h
branches/ge_dyn_load/extern/bullet2/src/BulletSoftBody/btSparseSDF.h
branches/ge_dyn_load/extern/bullet2/src/LinearMath/btConvexHull.cpp
branches/ge_dyn_load/extern/bullet2/src/LinearMath/btConvexHull.h
branches/ge_dyn_load/extern/bullet2/src/LinearMath/btHashMap.h
branches/ge_dyn_load/extern/bullet2/src/LinearMath/btPoolAllocator.h
branches/ge_dyn_load/extern/glew/README.txt
branches/ge_dyn_load/extern/glew/doc/glew.css
branches/ge_dyn_load/extern/glew/doc/glx.txt
branches/ge_dyn_load/extern/glew/doc/gpl.txt
branches/ge_dyn_load/extern/glew/doc/sgi.txt
branches/ge_dyn_load/extern/lzma/Alloc.c
branches/ge_dyn_load/extern/lzma/Alloc.h
branches/ge_dyn_load/extern/lzma/CMakeLists.txt
branches/ge_dyn_load/extern/lzma/LzFind.c
branches/ge_dyn_load/extern/lzma/LzFind.h
branches/ge_dyn_load/extern/lzma/LzHash.h
branches/ge_dyn_load/extern/lzma/LzmaDec.c
branches/ge_dyn_load/extern/lzma/LzmaDec.h
branches/ge_dyn_load/extern/lzma/LzmaEnc.c
branches/ge_dyn_load/extern/lzma/LzmaEnc.h
branches/ge_dyn_load/extern/lzma/LzmaLib.c
branches/ge_dyn_load/extern/lzma/LzmaLib.h
branches/ge_dyn_load/extern/lzma/history.txt
branches/ge_dyn_load/extern/lzma/lzma.txt
branches/ge_dyn_load/extern/lzo/CMakeLists.txt
branches/ge_dyn_load/extern/lzo/minilzo/minilzo.h
branches/ge_dyn_load/extern/xvidcore/src/image/qpel.c
branches/ge_dyn_load/release/io/
branches/ge_dyn_load/release/ui/
Property changes on: branches/ge_dyn_load
___________________________________________________________________
Name: svn:ignore
- user-config.py
.*
build
install
mingw-user-config.py
msvc-user-config.py
sgc.bat
smc.bat
ssenv.bat
user-config.py
*.pdb
mingw
msvc
+ *.pdb
.*
TAGS
build
cscope.out
install
mingw
mingw-user-config.py
msvc
msvc-user-config.py
obj
sgc.bat
smc.bat
ssenv.bat
tags
user-config.py
user-def.mk
Modified: branches/ge_dyn_load/CMakeLists.txt
===================================================================
--- branches/ge_dyn_load/CMakeLists.txt 2009-09-25 10:52:29 UTC (rev 23482)
+++ branches/ge_dyn_load/CMakeLists.txt 2009-09-25 10:59:36 UTC (rev 23483)
@@ -409,7 +409,7 @@
ENDIF(WITH_JACK)
IF(WITH_SNDFILE)
- SET(SNDFILE /usr)
+ SET(SNDFILE ${LIBDIR}/sndfile)
SET(SNDFILE_INC ${SNDFILE}/include)
SET(SNDFILE_LIB sndfile)
SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
Modified: branches/ge_dyn_load/extern/bullet2/src/Bullet-C-Api.h
===================================================================
--- branches/ge_dyn_load/extern/bullet2/src/Bullet-C-Api.h 2009-09-25
10:52:29 UTC (rev 23482)
+++ branches/ge_dyn_load/extern/bullet2/src/Bullet-C-Api.h 2009-09-25
10:59:36 UTC (rev 23483)
@@ -1,175 +1,175 @@
-/*
-Bullet Continuous Collision Detection and Physics Library
-Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
-
-This software is provided 'as-is', without any express or implied warranty.
-In no event will the authors be held liable for any damages arising from the
use of this software.
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it freely,
-subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not claim
that you wrote the original software. If you use this software in a product, an
acknowledgment in the product documentation would be appreciated but is not
required.
-2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-*/
-
-/*
- Draft high-level generic physics C-API. For low-level access, use the
physics SDK native API's.
- Work in progress, functionality will be added on demand.
-
- If possible, use the richer Bullet C++ API, by including
"btBulletDynamicsCommon.h"
-*/
-
-#ifndef BULLET_C_API_H
-#define BULLET_C_API_H
-
-#define PL_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
-
-#ifdef BT_USE_DOUBLE_PRECISION
-typedef double plReal;
-#else
-typedef float plReal;
-#endif
-
-typedef plReal plVector3[3];
-typedef plReal plQuaternion[4];
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** Particular physics SDK (C-API) */
- PL_DECLARE_HANDLE(plPhysicsSdkHandle);
-
-/** Dynamics world, belonging to some physics SDK (C-API)*/
- PL_DECLARE_HANDLE(plDynamicsWorldHandle);
-
-/** Rigid Body that can be part of a Dynamics World (C-API)*/
- PL_DECLARE_HANDLE(plRigidBodyHandle);
-
-/** Collision Shape/Geometry, property of a Rigid Body (C-API)*/
- PL_DECLARE_HANDLE(plCollisionShapeHandle);
-
-/** Constraint for Rigid Bodies (C-API)*/
- PL_DECLARE_HANDLE(plConstraintHandle);
-
-/** Triangle Mesh interface (C-API)*/
- PL_DECLARE_HANDLE(plMeshInterfaceHandle);
-
-/** Broadphase Scene/Proxy Handles (C-API)*/
- PL_DECLARE_HANDLE(plCollisionBroadphaseHandle);
- PL_DECLARE_HANDLE(plBroadphaseProxyHandle);
- PL_DECLARE_HANDLE(plCollisionWorldHandle);
-
-/**
- Create and Delete a Physics SDK
-*/
-
- extern plPhysicsSdkHandle plNewBulletSdk(); //this could be also
another sdk, like ODE, PhysX etc.
- extern void plDeletePhysicsSdk(plPhysicsSdkHandle
physicsSdk);
-
-/** Collision World, not strictly necessary, you can also just create a
Dynamics World with Rigid Bodies which internally manages the Collision World
with Collision Objects */
-
- typedef void(*btBroadphaseCallback)(void* clientData, void*
object1,void* object2);
-
- extern plCollisionBroadphaseHandle
plCreateSapBroadphase(btBroadphaseCallback beginCallback,btBroadphaseCallback
endCallback);
-
- extern void plDestroyBroadphase(plCollisionBroadphaseHandle bp);
-
- extern plBroadphaseProxyHandle
plCreateProxy(plCollisionBroadphaseHandle bp, void* clientData, plReal
minX,plReal minY,plReal minZ, plReal maxX,plReal maxY, plReal maxZ);
-
- extern void plDestroyProxy(plCollisionBroadphaseHandle bp,
plBroadphaseProxyHandle proxyHandle);
-
- extern void plSetBoundingBox(plBroadphaseProxyHandle proxyHandle,
plReal minX,plReal minY,plReal minZ, plReal maxX,plReal maxY, plReal maxZ);
-
-/* todo: add pair cache support with queries like add/remove/find pair */
-
- extern plCollisionWorldHandle plCreateCollisionWorld(plPhysicsSdkHandle
physicsSdk);
-
-/* todo: add/remove objects */
-
-
-/* Dynamics World */
-
- extern plDynamicsWorldHandle plCreateDynamicsWorld(plPhysicsSdkHandle
physicsSdk);
-
- extern void plDeleteDynamicsWorld(plDynamicsWorldHandle
world);
-
- extern void plStepSimulation(plDynamicsWorldHandle, plReal
timeStep);
-
- extern void plAddRigidBody(plDynamicsWorldHandle world,
plRigidBodyHandle object);
-
- extern void plRemoveRigidBody(plDynamicsWorldHandle world,
plRigidBodyHandle object);
-
-
-/* Rigid Body */
-
- extern plRigidBodyHandle plCreateRigidBody( void* user_data, float
mass, plCollisionShapeHandle cshape );
-
- extern void plDeleteRigidBody(plRigidBodyHandle body);
-
-
-/* Collision Shape definition */
-
- extern plCollisionShapeHandle plNewSphereShape(plReal radius);
- extern plCollisionShapeHandle plNewBoxShape(plReal x, plReal y, plReal
z);
- extern plCollisionShapeHandle plNewCapsuleShape(plReal radius, plReal
height);
- extern plCollisionShapeHandle plNewConeShape(plReal radius, plReal
height);
- extern plCollisionShapeHandle plNewCylinderShape(plReal radius, plReal
height);
- extern plCollisionShapeHandle plNewCompoundShape();
- extern void plAddChildShape(plCollisionShapeHandle
compoundShape,plCollisionShapeHandle childShape, plVector3
childPos,plQuaternion childOrn);
-
- extern void plDeleteShape(plCollisionShapeHandle shape);
-
- /* Convex Meshes */
- extern plCollisionShapeHandle plNewConvexHullShape();
- extern void plAddVertex(plCollisionShapeHandle convexHull,
plReal x,plReal y,plReal z);
-/* Concave static triangle meshes */
- extern plMeshInterfaceHandle plNewMeshInterface();
- extern void plAddTriangle(plMeshInterfaceHandle meshHandle,
plVector3 v0,plVector3 v1,plVector3 v2);
- extern plCollisionShapeHandle
plNewStaticTriangleMeshShape(plMeshInterfaceHandle);
-
- extern void plSetScaling(plCollisionShapeHandle shape, plVector3
scaling);
-
-/* SOLID has Response Callback/Table/Management */
-/* PhysX has Triggers, User Callbacks and filtering */
-/* ODE has the typedef void dNearCallback (void *data, dGeomID o1, dGeomID
o2); */
-
-/* typedef void plUpdatedPositionCallback(void* userData,
plRigidBodyHandle rbHandle, plVector3 pos); */
-/* typedef void plUpdatedOrientationCallback(void* userData,
plRigidBodyHandle rbHandle, plQuaternion orientation); */
-
- /* get world transform */
- extern void plGetOpenGLMatrix(plRigidBodyHandle object, plReal*
matrix);
- extern void plGetPosition(plRigidBodyHandle object,plVector3
position);
- extern void plGetOrientation(plRigidBodyHandle object,plQuaternion
orientation);
-
- /* set world transform (position/orientation) */
- extern void plSetPosition(plRigidBodyHandle object, const plVector3
position);
- extern void plSetOrientation(plRigidBodyHandle object, const
plQuaternion orientation);
- extern void plSetEuler(plReal yaw,plReal pitch,plReal roll,
plQuaternion orient);
-
- typedef struct plRayCastResult {
- plRigidBodyHandle m_body;
- plCollisionShapeHandle m_shape;
- plVector3 m_positionWorld;
- plVector3 m_normalWorld;
- } plRayCastResult;
-
- extern int plRayCast(plDynamicsWorldHandle world, const plVector3
rayStart, const plVector3 rayEnd, plRayCastResult res);
-
- /* Sweep API */
-
- /* extern plRigidBodyHandle plObjectCast(plDynamicsWorldHandle world,
const plVector3 rayStart, const plVector3 rayEnd, plVector3 hitpoint, plVector3
normal); */
-
- /* Continuous Collision Detection API */
-
- // needed for source/blender/blenkernel/intern/collision.c
- double plNearestPoints(float p1[3], float p2[3], float p3[3], float
q1[3], float q2[3], float q3[3], float *pa, float *pb, float normal[3]);
-
-#ifdef __cplusplus
-}
-#endif
-
-
-#endif //BULLET_C_API_H
-
+/*
+Bullet Continuous Collision Detection and Physics Library
+Copyright (c) 2003-2006 Erwin Coumans http://continuousphysics.com/Bullet/
+
+This software is provided 'as-is', without any express or implied warranty.
+In no event will the authors be held liable for any damages arising from the
use of this software.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it freely,
+subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not claim
that you wrote the original software. If you use this software in a product, an
acknowledgment in the product documentation would be appreciated but is not
required.
+2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+*/
+
+/*
+ Draft high-level generic physics C-API. For low-level access, use the
physics SDK native API's.
+ Work in progress, functionality will be added on demand.
+
+ If possible, use the richer Bullet C++ API, by including
"btBulletDynamicsCommon.h"
+*/
+
+#ifndef BULLET_C_API_H
+#define BULLET_C_API_H
+
+#define PL_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
+
+#ifdef BT_USE_DOUBLE_PRECISION
+typedef double plReal;
+#else
+typedef float plReal;
+#endif
+
+typedef plReal plVector3[3];
+typedef plReal plQuaternion[4];
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** Particular physics SDK (C-API) */
+ PL_DECLARE_HANDLE(plPhysicsSdkHandle);
+
+/** Dynamics world, belonging to some physics SDK (C-API)*/
+ PL_DECLARE_HANDLE(plDynamicsWorldHandle);
+
+/** Rigid Body that can be part of a Dynamics World (C-API)*/
+ PL_DECLARE_HANDLE(plRigidBodyHandle);
+
+/** Collision Shape/Geometry, property of a Rigid Body (C-API)*/
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
