[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25006] branches/soc-2009-chingachgook: Merge from trunk -r 24758:25003.
Arystanbek Dyussenov
arystan.d at gmail.com
Sun Nov 29 19:54:38 CET 2009
Revision: 25006
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25006
Author: kazanbas
Date: 2009-11-29 19:54:37 +0100 (Sun, 29 Nov 2009)
Log Message:
-----------
Merge from trunk -r 24758:25003.
Modified Paths:
--------------
branches/soc-2009-chingachgook/CMakeLists.txt
branches/soc-2009-chingachgook/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
branches/soc-2009-chingachgook/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
branches/soc-2009-chingachgook/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
branches/soc-2009-chingachgook/extern/glew/make/msvc_9_0/glew.vcproj
branches/soc-2009-chingachgook/intern/audaspace/make/msvc_9_0/audaspace.vcproj
branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_Window.cpp
branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2009-chingachgook/projectfiles_vc9/blender/blender.sln
branches/soc-2009-chingachgook/projectfiles_vc9/blender/blender.vcproj
branches/soc-2009-chingachgook/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2009-chingachgook/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
branches/soc-2009-chingachgook/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
branches/soc-2009-chingachgook/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/soc-2009-chingachgook/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/soc-2009-chingachgook/projectfiles_vc9/blender/windowmanager/windowmanager.vcproj
branches/soc-2009-chingachgook/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj
branches/soc-2009-chingachgook/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
branches/soc-2009-chingachgook/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj
branches/soc-2009-chingachgook/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj
branches/soc-2009-chingachgook/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj
branches/soc-2009-chingachgook/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj
branches/soc-2009-chingachgook/projectfiles_vc9/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
branches/soc-2009-chingachgook/release/VERSION
branches/soc-2009-chingachgook/release/datafiles/blenderbuttons
branches/soc-2009-chingachgook/release/datafiles/splash.png
branches/soc-2009-chingachgook/release/scripts/io/engine_render_pov.py
branches/soc-2009-chingachgook/release/scripts/io/export_3ds.py
branches/soc-2009-chingachgook/release/scripts/io/export_fbx.py
branches/soc-2009-chingachgook/release/scripts/io/export_mdd.py
branches/soc-2009-chingachgook/release/scripts/io/export_obj.py
branches/soc-2009-chingachgook/release/scripts/io/export_ply.py
branches/soc-2009-chingachgook/release/scripts/io/export_x3d.py
branches/soc-2009-chingachgook/release/scripts/io/import_anim_bvh.py
branches/soc-2009-chingachgook/release/scripts/io/import_scene_3ds.py
branches/soc-2009-chingachgook/release/scripts/io/import_scene_obj.py
branches/soc-2009-chingachgook/release/scripts/io/netrender/ui.py
branches/soc-2009-chingachgook/release/scripts/modules/bpy/__init__.py
branches/soc-2009-chingachgook/release/scripts/modules/bpy/utils.py
branches/soc-2009-chingachgook/release/scripts/modules/bpy_types.py
branches/soc-2009-chingachgook/release/scripts/modules/rna_prop_ui.py
branches/soc-2009-chingachgook/release/scripts/op/add_mesh_torus.py
branches/soc-2009-chingachgook/release/scripts/op/mesh_skin.py
branches/soc-2009-chingachgook/release/scripts/op/presets.py
branches/soc-2009-chingachgook/release/scripts/op/uvcalc_smart_project.py
branches/soc-2009-chingachgook/release/scripts/op/wm.py
branches/soc-2009-chingachgook/release/scripts/presets/render/HDTV_1080p.py
branches/soc-2009-chingachgook/release/scripts/presets/render/HDTV_720p.py
branches/soc-2009-chingachgook/release/scripts/presets/render/TV_PAL.py
branches/soc-2009-chingachgook/release/scripts/presets/render/TV_PAL_16_colon_9.py
branches/soc-2009-chingachgook/release/scripts/templates/operator.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_data_armature.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_data_bone.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_data_camera.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_data_curve.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_data_empty.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_data_lamp.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_data_lattice.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_data_mesh.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_data_metaball.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_data_modifier.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_game.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_material.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_object.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_object_constraint.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_particle.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_physics_cloth.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_physics_common.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_physics_field.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_physics_fluid.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_physics_smoke.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_physics_softbody.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_render.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_scene.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_texture.py
branches/soc-2009-chingachgook/release/scripts/ui/properties_world.py
branches/soc-2009-chingachgook/release/scripts/ui/space_buttons.py
branches/soc-2009-chingachgook/release/scripts/ui/space_console.py
branches/soc-2009-chingachgook/release/scripts/ui/space_filebrowser.py
branches/soc-2009-chingachgook/release/scripts/ui/space_image.py
branches/soc-2009-chingachgook/release/scripts/ui/space_info.py
branches/soc-2009-chingachgook/release/scripts/ui/space_logic.py
branches/soc-2009-chingachgook/release/scripts/ui/space_node.py
branches/soc-2009-chingachgook/release/scripts/ui/space_outliner.py
branches/soc-2009-chingachgook/release/scripts/ui/space_sequencer.py
branches/soc-2009-chingachgook/release/scripts/ui/space_text.py
branches/soc-2009-chingachgook/release/scripts/ui/space_time.py
branches/soc-2009-chingachgook/release/scripts/ui/space_userpref.py
branches/soc-2009-chingachgook/release/scripts/ui/space_view3d.py
branches/soc-2009-chingachgook/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_action.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_constraint.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_context.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_key.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_modifier.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_particle.h
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/action.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/armature.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/constraint.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/context.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/fcurve.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/key.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/modifier.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/node.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/object.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/particle.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/particle_system.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/scene.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/seqeffects.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/sequence.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/softbody.c
branches/soc-2009-chingachgook/source/blender/blenlib/BLI_listbase.h
branches/soc-2009-chingachgook/source/blender/blenlib/BLI_math_geom.h
branches/soc-2009-chingachgook/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2009-chingachgook/source/blender/blenlib/BLI_math_vector.h
branches/soc-2009-chingachgook/source/blender/blenlib/intern/listbase.c
branches/soc-2009-chingachgook/source/blender/blenlib/intern/math_geom.c
branches/soc-2009-chingachgook/source/blender/blenlib/intern/math_matrix.c
branches/soc-2009-chingachgook/source/blender/blenlib/intern/math_vector.c
branches/soc-2009-chingachgook/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2009-chingachgook/source/blender/blenloader/intern/readfile.c
branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp
branches/soc-2009-chingachgook/source/blender/editors/animation/anim_deps.c
branches/soc-2009-chingachgook/source/blender/editors/animation/anim_filter.c
branches/soc-2009-chingachgook/source/blender/editors/animation/anim_intern.h
branches/soc-2009-chingachgook/source/blender/editors/animation/anim_ops.c
branches/soc-2009-chingachgook/source/blender/editors/animation/drivers.c
branches/soc-2009-chingachgook/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2009-chingachgook/source/blender/editors/animation/keyframes_edit.c
branches/soc-2009-chingachgook/source/blender/editors/animation/keyframing.c
branches/soc-2009-chingachgook/source/blender/editors/animation/keyingsets.c
branches/soc-2009-chingachgook/source/blender/editors/armature/armature_intern.h
branches/soc-2009-chingachgook/source/blender/editors/armature/armature_ops.c
branches/soc-2009-chingachgook/source/blender/editors/armature/editarmature.c
branches/soc-2009-chingachgook/source/blender/editors/armature/editarmature_generate.c
branches/soc-2009-chingachgook/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2009-chingachgook/source/blender/editors/armature/meshlaplacian.c
branches/soc-2009-chingachgook/source/blender/editors/armature/meshlaplacian.h
branches/soc-2009-chingachgook/source/blender/editors/armature/poseSlide.c
branches/soc-2009-chingachgook/source/blender/editors/armature/poseobject.c
branches/soc-2009-chingachgook/source/blender/editors/curve/curve_ops.c
branches/soc-2009-chingachgook/source/blender/editors/curve/editcurve.c
branches/soc-2009-chingachgook/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2009-chingachgook/source/blender/editors/datafiles/prvicons.c
branches/soc-2009-chingachgook/source/blender/editors/datafiles/splash.png.c
branches/soc-2009-chingachgook/source/blender/editors/include/ED_anim_api.h
branches/soc-2009-chingachgook/source/blender/editors/include/ED_armature.h
branches/soc-2009-chingachgook/source/blender/editors/include/ED_curve.h
branches/soc-2009-chingachgook/source/blender/editors/include/ED_mball.h
branches/soc-2009-chingachgook/source/blender/editors/include/ED_mesh.h
branches/soc-2009-chingachgook/source/blender/editors/include/ED_object.h
branches/soc-2009-chingachgook/source/blender/editors/include/ED_screen.h
branches/soc-2009-chingachgook/source/blender/editors/include/ED_screen_types.h
branches/soc-2009-chingachgook/source/blender/editors/include/ED_transform.h
branches/soc-2009-chingachgook/source/blender/editors/include/UI_icons.h
branches/soc-2009-chingachgook/source/blender/editors/include/UI_interface.h
branches/soc-2009-chingachgook/source/blender/editors/interface/interface.c
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_anim.c
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_draw.c
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_intern.h
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_layout.c
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_regions.c
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_templates.c
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_utils.c
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-chingachgook/source/blender/editors/mesh/editmesh.c
branches/soc-2009-chingachgook/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2009-chingachgook/source/blender/editors/mesh/mesh_ops.c
branches/soc-2009-chingachgook/source/blender/editors/mesh/meshtools.c
branches/soc-2009-chingachgook/source/blender/editors/metaball/mball_edit.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_add.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_constraint.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_edit.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_hook.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_intern.h
branches/soc-2009-chingachgook/source/blender/editors/object/object_lattice.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_modifier.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_ops.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_relations.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_shapekey.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_transform.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_vgroup.c
branches/soc-2009-chingachgook/source/blender/editors/physics/particle_object.c
branches/soc-2009-chingachgook/source/blender/editors/physics/physics_intern.h
branches/soc-2009-chingachgook/source/blender/editors/physics/physics_ops.c
branches/soc-2009-chingachgook/source/blender/editors/physics/physics_pointcache.c
branches/soc-2009-chingachgook/source/blender/editors/screen/area.c
branches/soc-2009-chingachgook/source/blender/editors/screen/glutil.c
branches/soc-2009-chingachgook/source/blender/editors/screen/screen_context.c
branches/soc-2009-chingachgook/source/blender/editors/screen/screen_edit.c
branches/soc-2009-chingachgook/source/blender/editors/screen/screen_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_action/action_edit.c
branches/soc-2009-chingachgook/source/blender/editors/space_action/action_header.c
branches/soc-2009-chingachgook/source/blender/editors/space_action/action_intern.h
branches/soc-2009-chingachgook/source/blender/editors/space_action/action_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_action/action_select.c
branches/soc-2009-chingachgook/source/blender/editors/space_action/space_action.c
branches/soc-2009-chingachgook/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-chingachgook/source/blender/editors/space_console/space_console.c
branches/soc-2009-chingachgook/source/blender/editors/space_file/file_intern.h
branches/soc-2009-chingachgook/source/blender/editors/space_file/file_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_file/file_panels.c
branches/soc-2009-chingachgook/source/blender/editors/space_file/filesel.c
branches/soc-2009-chingachgook/source/blender/editors/space_file/space_file.c
branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_draw.c
branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_edit.c
branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_header.c
branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_intern.h
branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_graph/space_graph.c
branches/soc-2009-chingachgook/source/blender/editors/space_image/space_image.c
branches/soc-2009-chingachgook/source/blender/editors/space_info/space_info.c
branches/soc-2009-chingachgook/source/blender/editors/space_logic/logic_window.c
branches/soc-2009-chingachgook/source/blender/editors/space_logic/space_logic.c
branches/soc-2009-chingachgook/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2009-chingachgook/source/blender/editors/space_nla/nla_channels.c
branches/soc-2009-chingachgook/source/blender/editors/space_nla/nla_edit.c
branches/soc-2009-chingachgook/source/blender/editors/space_nla/nla_header.c
branches/soc-2009-chingachgook/source/blender/editors/space_nla/nla_intern.h
branches/soc-2009-chingachgook/source/blender/editors/space_nla/nla_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_nla/space_nla.c
branches/soc-2009-chingachgook/source/blender/editors/space_node/space_node.c
branches/soc-2009-chingachgook/source/blender/editors/space_outliner/outliner.c
branches/soc-2009-chingachgook/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2009-chingachgook/source/blender/editors/space_script/script_edit.c
branches/soc-2009-chingachgook/source/blender/editors/space_script/space_script.c
branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2009-chingachgook/source/blender/editors/space_sound/space_sound.c
branches/soc-2009-chingachgook/source/blender/editors/space_text/space_text.c
branches/soc-2009-chingachgook/source/blender/editors/space_text/text_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_time/space_time.c
branches/soc-2009-chingachgook/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2009-chingachgook/source/blender/editors/transform/transform.c
branches/soc-2009-chingachgook/source/blender/editors/transform/transform.h
branches/soc-2009-chingachgook/source/blender/editors/transform/transform_constraints.c
branches/soc-2009-chingachgook/source/blender/editors/transform/transform_conversions.c
branches/soc-2009-chingachgook/source/blender/editors/transform/transform_generics.c
branches/soc-2009-chingachgook/source/blender/editors/transform/transform_ops.c
branches/soc-2009-chingachgook/source/blender/editors/transform/transform_snap.c
branches/soc-2009-chingachgook/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_anim_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_armature_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_particle_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_scene_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2009-chingachgook/source/blender/makesrna/RNA_access.h
branches/soc-2009-chingachgook/source/blender/makesrna/RNA_define.h
branches/soc-2009-chingachgook/source/blender/makesrna/RNA_enum_types.h
branches/soc-2009-chingachgook/source/blender/makesrna/RNA_types.h
branches/soc-2009-chingachgook/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_ID.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_armature.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_curve.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_define.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_internal_types.h
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_particle.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_pose.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_rna.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_sequence.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_wm.c
branches/soc-2009-chingachgook/source/blender/python/generic/vector.c
branches/soc-2009-chingachgook/source/blender/python/intern/bpy_operator.c
branches/soc-2009-chingachgook/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2009-chingachgook/source/blender/python/intern/bpy_rna.c
branches/soc-2009-chingachgook/source/blender/python/intern/bpy_util.c
branches/soc-2009-chingachgook/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2009-chingachgook/source/blender/render/SConscript
branches/soc-2009-chingachgook/source/blender/render/intern/source/convertblender.c
branches/soc-2009-chingachgook/source/blender/windowmanager/WM_api.h
branches/soc-2009-chingachgook/source/blender/windowmanager/WM_types.h
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_files.c
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_window.c
branches/soc-2009-chingachgook/source/blender/windowmanager/wm_event_system.h
branches/soc-2009-chingachgook/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2009-chingachgook/source/creator/creator.c
branches/soc-2009-chingachgook/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2009-chingachgook/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/soc-2009-chingachgook/source/gameengine/Converter/BL_MeshDeformer.h
branches/soc-2009-chingachgook/source/gameengine/Converter/BL_ModifierDeformer.cpp
branches/soc-2009-chingachgook/source/gameengine/Converter/BL_ModifierDeformer.h
branches/soc-2009-chingachgook/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2009-chingachgook/source/gameengine/Converter/BL_ShapeDeformer.h
branches/soc-2009-chingachgook/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2009-chingachgook/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2009-chingachgook/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2009-chingachgook/source/gameengine/GamePlayer/common/windows/GPW_Engine.cpp
branches/soc-2009-chingachgook/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2009-chingachgook/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2009-chingachgook/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2009-chingachgook/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2009-chingachgook/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2009-chingachgook/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2009-chingachgook/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2009-chingachgook/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2009-chingachgook/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2009-chingachgook/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2009-chingachgook/source/gameengine/PyDoc/GameTypes.py
branches/soc-2009-chingachgook/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2009-chingachgook/source/gameengine/Rasterizer/Makefile
branches/soc-2009-chingachgook/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/soc-2009-chingachgook/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2009-chingachgook/source/gameengine/Rasterizer/SConscript
Added Paths:
-----------
branches/soc-2009-chingachgook/release/scripts/modules/rigify.py
branches/soc-2009-chingachgook/release/scripts/op/object.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/apple.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/chicken.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/cream.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/ketchup.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/marble.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/potato.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/skim_milk.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/skin1.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/skin2.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/whole_milk.py
branches/soc-2009-chingachgook/release/text/readme.html
branches/soc-2009-chingachgook/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
branches/soc-2009-chingachgook/source/gameengine/Converter/KX_SoftBodyDeformer.h
Removed Paths:
-------------
branches/soc-2009-chingachgook/release/scripts/presets/sss/Apple.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/Chicken.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/Cream.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/Ketchup.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/Marble.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/Potato.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/Skin1.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/Skin2.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/Skin_Milk.py
branches/soc-2009-chingachgook/release/scripts/presets/sss/Whole_Milk.py
branches/soc-2009-chingachgook/release/text/BlenderQuickStart.pdf
branches/soc-2009-chingachgook/release/text/blender.html
branches/soc-2009-chingachgook/release/text/release_249.txt
branches/soc-2009-chingachgook/source/gameengine/Converter/BL_SkinMeshObject.cpp
branches/soc-2009-chingachgook/source/gameengine/Converter/BL_SkinMeshObject.h
Property Changed:
----------------
branches/soc-2009-chingachgook/release/scripts/
branches/soc-2009-chingachgook/release/scripts/modules/
branches/soc-2009-chingachgook/release/scripts/modules/bpy/
branches/soc-2009-chingachgook/release/scripts/modules/console/
branches/soc-2009-chingachgook/release/scripts/op/
branches/soc-2009-chingachgook/release/scripts/presets/
branches/soc-2009-chingachgook/release/scripts/presets/cloth/
branches/soc-2009-chingachgook/release/scripts/presets/cloth/cotton.py
branches/soc-2009-chingachgook/release/scripts/presets/cloth/denim.py
branches/soc-2009-chingachgook/release/scripts/presets/cloth/leather.py
branches/soc-2009-chingachgook/release/scripts/presets/cloth/rubber.py
branches/soc-2009-chingachgook/release/scripts/presets/cloth/silk.py
branches/soc-2009-chingachgook/release/scripts/presets/render/
branches/soc-2009-chingachgook/release/scripts/presets/sss/
branches/soc-2009-chingachgook/release/scripts/templates/
Modified: branches/soc-2009-chingachgook/CMakeLists.txt
===================================================================
--- branches/soc-2009-chingachgook/CMakeLists.txt 2009-11-29 18:20:26 UTC (rev 25005)
+++ branches/soc-2009-chingachgook/CMakeLists.txt 2009-11-29 18:54:37 UTC (rev 25006)
@@ -1,4 +1,4 @@
-# $Id$
+ # $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or
@@ -531,19 +531,21 @@
SET(LLIBS stdc++ SystemStubs)
IF (WITH_COCOA)
- SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -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")
- ELSE(USE_QTKIT)
- IF(WITH_QUICKTIME)
- SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
- ENDIF(WITH_QUICKTIME)
- ENDIF(USE_QTKIT)
+ 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(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+ ELSEIF(WITH_QUICKTIME)
+ SET(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework QuickTime")
+ ENDIF(USE_QTKIT)
ELSE (WITH_COCOA)
- SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
- 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(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")
ENDIF (WITH_COCOA)
IF(WITH_OPENMP)
@@ -585,15 +587,23 @@
SET(EXETYPE MACOSX_BUNDLE)
-
+ SET(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
+ SET(CMAKE_CXX_FLAGS_DEBUG "-fno-strict-aliasing -g")
IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
- SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller")
- SET(CMAKE_C_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller")
+ SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller")
+ SET(CMAKE_C_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -fvariable-expansion-in-unroller")
ELSEIF(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
- SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller")
- SET(CMAKE_C_FLAGS_RELEASE "-O3 -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller")
+ SET(CMAKE_CXX_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller")
+ SET(CMAKE_C_FLAGS_RELEASE "-O3 -mdynamic-no-pic -ftree-vectorize -msse -msse2 -msse3 -mssse3 -fvariable-expansion-in-unroller")
+ ELSE(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64")
+ SET(CMAKE_C_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
+ SET(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
+ # Better warnings
+ SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
+ SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
+
ENDIF(APPLE)
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
Modified: branches/soc-2009-chingachgook/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h
===================================================================
--- branches/soc-2009-chingachgook/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h 2009-11-29 18:20:26 UTC (rev 25005)
+++ branches/soc-2009-chingachgook/extern/bullet2/src/BulletCollision/BroadphaseCollision/btBroadphaseProxy.h 2009-11-29 18:54:37 UTC (rev 25006)
@@ -152,6 +152,10 @@
{
return (proxyType == STATIC_PLANE_PROXYTYPE);
}
+ static SIMD_FORCE_INLINE bool isSoftBody(int proxyType)
+ {
+ return (proxyType == SOFTBODY_SHAPE_PROXYTYPE);
+ }
}
;
Modified: branches/soc-2009-chingachgook/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
===================================================================
--- branches/soc-2009-chingachgook/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp 2009-11-29 18:20:26 UTC (rev 25005)
+++ branches/soc-2009-chingachgook/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp 2009-11-29 18:54:37 UTC (rev 25006)
@@ -31,6 +31,7 @@
#include "LinearMath/btAabbUtil2.h"
#include "LinearMath/btQuickprof.h"
#include "LinearMath/btStackAlloc.h"
+#include "BulletSoftBody/btSoftBody.h"
//#define USE_BRUTEFORCE_RAYBROADPHASE 1
//RECALCULATE_AABB is slower, but benefit is that you don't need to call 'stepSimulation' or 'updateAabbs' before using a rayTest
@@ -411,6 +412,31 @@
// restore
collisionObject->internalSetTemporaryCollisionShape(saveCollisionShape);
}
+ } else {
+ if (collisionShape->isSoftBody()) {
+ btSoftBody* softBody = static_cast<btSoftBody*>(collisionObject);
+ btSoftBody::sRayCast softResult;
+ if (softBody->rayTest(rayFromTrans.getOrigin(), rayToTrans.getOrigin(), softResult))
+ {
+ btCollisionWorld::LocalShapeInfo shapeInfo;
+ shapeInfo.m_shapePart = 0;
+ shapeInfo.m_triangleIndex = softResult.index;
+ // get the normal
+ btVector3 normal = softBody->m_faces[softResult.index].m_normal;
+ btVector3 rayDir = rayToTrans.getOrigin() - rayFromTrans.getOrigin();
+ if (normal.dot(rayDir) > 0) {
+ // normal always point toward origin of the ray
+ normal = -normal;
+ }
+ btCollisionWorld::LocalRayResult rayResult
+ (collisionObject,
+ &shapeInfo,
+ normal,
+ softResult.fraction);
+ bool normalInWorldSpace = true;
+ resultCallback.addSingleResult(rayResult,normalInWorldSpace);
+ }
+ }
}
}
}
Modified: branches/soc-2009-chingachgook/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h
===================================================================
--- branches/soc-2009-chingachgook/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h 2009-11-29 18:20:26 UTC (rev 25005)
+++ branches/soc-2009-chingachgook/extern/bullet2/src/BulletCollision/CollisionShapes/btCollisionShape.h 2009-11-29 18:54:37 UTC (rev 25006)
@@ -72,6 +72,10 @@
{
return btBroadphaseProxy::isCompound(getShapeType());
}
+ SIMD_FORCE_INLINE bool isSoftBody() const
+ {
+ return btBroadphaseProxy::isSoftBody(getShapeType());
+ }
///isInfinite is used to catch simulation error (aabb check)
SIMD_FORCE_INLINE bool isInfinite() const
Modified: branches/soc-2009-chingachgook/extern/glew/make/msvc_9_0/glew.vcproj
===================================================================
--- branches/soc-2009-chingachgook/extern/glew/make/msvc_9_0/glew.vcproj 2009-11-29 18:20:26 UTC (rev 25005)
+++ branches/soc-2009-chingachgook/extern/glew/make/msvc_9_0/glew.vcproj 2009-11-29 18:54:37 UTC (rev 25006)
@@ -43,7 +43,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB;GLEW_STATIC"
MinimalRebuild="false"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
@@ -115,7 +115,7 @@
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="..\..\include"
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;GLEW_STATIC"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
Modified: branches/soc-2009-chingachgook/intern/audaspace/make/msvc_9_0/audaspace.vcproj
===================================================================
--- branches/soc-2009-chingachgook/intern/audaspace/make/msvc_9_0/audaspace.vcproj 2009-11-29 18:20:26 UTC (rev 25005)
+++ branches/soc-2009-chingachgook/intern/audaspace/make/msvc_9_0/audaspace.vcproj 2009-11-29 18:54:37 UTC (rev 25006)
@@ -342,6 +342,10 @@
>
</File>
<File
+ RelativePath="..\..\intern\AUD_C-API.h"
+ >
+ </File>
+ <File
RelativePath="..\..\intern\AUD_ChannelMapperFactory.cpp"
>
</File>
@@ -758,10 +762,6 @@
>
</File>
</Filter>
- <File
- RelativePath="..\..\AUD_C-API.h"
- >
- </File>
</Files>
<Globals>
</Globals>
Modified: branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_SystemX11.cpp 2009-11-29 18:20:26 UTC (rev 25005)
+++ branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_SystemX11.cpp 2009-11-29 18:54:37 UTC (rev 25006)
@@ -23,6 +23,9 @@
*
* Contributor(s): none yet.
*
+ * Part of this code has been taken from Qt, under LGPL license
+ * Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ *
* ***** END GPL LICENSE BLOCK *****
*/
@@ -126,7 +129,9 @@
m_xclip_out= XInternAtom(m_display, "XCLIP_OUT", False);
m_incr= XInternAtom(m_display, "INCR", False);
m_utf8_string= XInternAtom(m_display, "UTF8_STRING", False);
+ m_last_warp = 0;
+
// compute the initial time
timeval tv;
if (gettimeofday(&tv,NULL) == -1) {
@@ -310,6 +315,61 @@
}
}
+/* This function borrowed from Qt's X11 support
+ * qclipboard_x11.cpp
+ * */
+struct init_timestamp_data
+{
+ Time timestamp;
+};
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list