[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28249] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 28247.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Apr 18 04:03:25 CEST 2010
Revision: 28249
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28249
Author: kjym3
Date: 2010-04-18 04:03:19 +0200 (Sun, 18 Apr 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 28247.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28247
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
branches/soc-2008-mxcurioni/intern/iksolver/intern/TNT/svd.h
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blender.sln
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blender.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
branches/soc-2008-mxcurioni/release/datafiles/splash.png
branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/freestyle_init.py
branches/soc-2008-mxcurioni/release/scripts/io/engine_render_pov.py
branches/soc-2008-mxcurioni/release/scripts/io/export_3ds.py
branches/soc-2008-mxcurioni/release/scripts/io/export_fbx.py
branches/soc-2008-mxcurioni/release/scripts/io/export_mdd.py
branches/soc-2008-mxcurioni/release/scripts/io/export_obj.py
branches/soc-2008-mxcurioni/release/scripts/io/export_ply.py
branches/soc-2008-mxcurioni/release/scripts/io/export_x3d.py
branches/soc-2008-mxcurioni/release/scripts/io/import_anim_bvh.py
branches/soc-2008-mxcurioni/release/scripts/io/import_scene_3ds.py
branches/soc-2008-mxcurioni/release/scripts/io/import_scene_obj.py
branches/soc-2008-mxcurioni/release/scripts/keyingsets/keyingsets_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/arm_biped.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/eye_balls.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/eye_lid.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/finger_curl.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/leg_biped.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/leg_quadruped.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/mouth.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/neck_flex.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/palm_curl.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/spine_pivot_flex.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/tail_control.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify_utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py
branches/soc-2008-mxcurioni/release/scripts/op/add_armature_human.py
branches/soc-2008-mxcurioni/release/scripts/op/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/op/console_python.py
branches/soc-2008-mxcurioni/release/scripts/op/fcurve_euler_filter.py
branches/soc-2008-mxcurioni/release/scripts/op/image.py
branches/soc-2008-mxcurioni/release/scripts/op/mesh.py
branches/soc-2008-mxcurioni/release/scripts/op/nla.py
branches/soc-2008-mxcurioni/release/scripts/op/object.py
branches/soc-2008-mxcurioni/release/scripts/op/object_align.py
branches/soc-2008-mxcurioni/release/scripts/op/object_randomize_transform.py
branches/soc-2008-mxcurioni/release/scripts/op/presets.py
branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/op/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/templates/gamelogic.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_cloth.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_scene.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_dopesheet.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_graph.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_node.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/source/Makefile
branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/Makefile
branches/soc-2008-mxcurioni/source/blender/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_colortools.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fluidsim.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_group.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_multires.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_screen.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_shrinkwrap.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_subsurf.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/BME_tools.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/Makefile
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fluidsim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/screen.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/unit.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_bfile.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_memarena.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_rand.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_threads.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_bfile.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_memarena.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/threads.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/uvproject.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/drivers.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poselib.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/B.blend.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/splash.png.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframes_edit.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_util.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/loopcut.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screendump.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/space_action.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/space_console.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/fsmenu.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/space_info.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/space_logic.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/space_nla.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_script/space_script.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sound/space_sound.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/space_text.c
branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/SConscript
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/util/ed_util.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeAttribute.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp
branches/soc-2008-mxcurioni/source/blender/gpu/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_extensions.h
branches/soc-2008-mxcurioni/source/blender/gpu/SConscript
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/allocimbuf.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_camera_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_color_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/SConscript
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/Makefile
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/SConscript
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_camera.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_meta.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
branches/soc-2008-mxcurioni/source/blender/python/doc/epy/Geometry.py
branches/soc-2008-mxcurioni/source/blender/python/doc/epy/Mathutils.py
branches/soc-2008-mxcurioni/source/blender/python/doc/sphinx_doc_gen.py
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/quicktime/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/quicktime/SConscript
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/Makefile
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_import.m
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2008-mxcurioni/source/blender/quicktime/quicktime_export.h
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/Makefile
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/source/Makefile
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/occlusion.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadbuf.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/sss.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/strand.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/SConscript
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Makefile
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/API_intro.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/GameKeys.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/GameLogic.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/GameTypes.py
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/ImageBuff.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/modifiers/
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/modifiers/modifiers.vcproj
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/neck.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/tongue.py
branches/soc-2008-mxcurioni/release/scripts/presets/interaction/
branches/soc-2008-mxcurioni/release/scripts/presets/interaction/blender.py
branches/soc-2008-mxcurioni/release/scripts/presets/interaction/maya.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref_keymap.py
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom_inline.c
branches/soc-2008-mxcurioni/source/blender/modifiers/
branches/soc-2008-mxcurioni/source/blender/modifiers/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/modifiers/MOD_modifiertypes.h
branches/soc-2008-mxcurioni/source/blender/modifiers/Makefile
branches/soc-2008-mxcurioni/source/blender/modifiers/SConscript
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean_util.h
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_build.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim_util.h
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_none.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_softbody.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_subsurf.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.h
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/Makefile
branches/soc-2008-mxcurioni/source/blender/python/doc/examples/mathutils.Euler.py
branches/soc-2008-mxcurioni/source/blender/python/doc/examples/mathutils.Matrix.py
branches/soc-2008-mxcurioni/source/blender/python/doc/examples/mathutils.Quaternion.py
branches/soc-2008-mxcurioni/source/blender/python/doc/examples/mathutils.Vector.py
branches/soc-2008-mxcurioni/source/blender/python/doc/examples/mathutils.py
branches/soc-2008-mxcurioni/source/blender/python/generic/blf_api.c
branches/soc-2008-mxcurioni/source/blender/python/generic/blf_api.h
branches/soc-2008-mxcurioni/source/blender/python/generic/geometry.c
branches/soc-2008-mxcurioni/source/blender/python/generic/geometry.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_color.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_color.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_euler.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_euler.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_matrix.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_matrix.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_quat.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_quat.h
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_vector.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_vector.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonKeyboard.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonMouse.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonMouse.h
Removed Paths:
-------------
branches/soc-2008-mxcurioni/make/pb_2_0_1/
branches/soc-2008-mxcurioni/make/xc_blender/
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/modifiers/modifiers.vcproj
branches/soc-2008-mxcurioni/release/scripts/presets/interaction/blender.py
branches/soc-2008-mxcurioni/release/scripts/presets/interaction/maya.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_booleanops.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_simple_deform.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/booleanops.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/simple_deform.c
branches/soc-2008-mxcurioni/source/blender/modifiers/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/modifiers/MOD_modifiertypes.h
branches/soc-2008-mxcurioni/source/blender/modifiers/Makefile
branches/soc-2008-mxcurioni/source/blender/modifiers/SConscript
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean_util.h
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_build.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim_util.h
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_none.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_softbody.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_subsurf.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.h
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/Makefile
branches/soc-2008-mxcurioni/source/blender/python/doc/examples/Mathutils.Euler.py
branches/soc-2008-mxcurioni/source/blender/python/doc/examples/Mathutils.Matrix.py
branches/soc-2008-mxcurioni/source/blender/python/doc/examples/Mathutils.Quaternion.py
branches/soc-2008-mxcurioni/source/blender/python/doc/examples/Mathutils.Vector.py
branches/soc-2008-mxcurioni/source/blender/python/doc/examples/Mathutils.py
branches/soc-2008-mxcurioni/source/blender/python/generic/Geometry.c
branches/soc-2008-mxcurioni/source/blender/python/generic/Geometry.h
branches/soc-2008-mxcurioni/source/blender/python/generic/Mathutils.c
branches/soc-2008-mxcurioni/source/blender/python/generic/Mathutils.h
branches/soc-2008-mxcurioni/source/blender/python/generic/blf.c
branches/soc-2008-mxcurioni/source/blender/python/generic/blf.h
branches/soc-2008-mxcurioni/source/blender/python/generic/euler.c
branches/soc-2008-mxcurioni/source/blender/python/generic/euler.h
branches/soc-2008-mxcurioni/source/blender/python/generic/matrix.c
branches/soc-2008-mxcurioni/source/blender/python/generic/matrix.h
branches/soc-2008-mxcurioni/source/blender/python/generic/quat.c
branches/soc-2008-mxcurioni/source/blender/python/generic/quat.h
branches/soc-2008-mxcurioni/source/blender/python/generic/vector.c
branches/soc-2008-mxcurioni/source/blender/python/generic/vector.h
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2010-04-17 23:47:47 UTC (rev 28248)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2010-04-18 02:03:19 UTC (rev 28249)
@@ -42,7 +42,7 @@
")
ENDIF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(Blender)
#-----------------------------------------------------------------------------
Modified: branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2010-04-17 23:47:47 UTC (rev 28248)
+++ branches/soc-2008-mxcurioni/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2010-04-18 02:03:19 UTC (rev 28249)
@@ -67,12 +67,12 @@
audio_pkg_data,
audio_pkg_size);
- buf_pos += data_size;
-
// read error, next packet!
if(read_length < 0)
break;
+ buf_pos += data_size;
+
// move packet parameters
audio_pkg_data += read_length;
audio_pkg_size -= read_length;
Modified: branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h 2010-04-17 23:47:47 UTC (rev 28248)
+++ branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h 2010-04-18 02:03:19 UTC (rev 28249)
@@ -331,7 +331,7 @@
* @param y The y-coordinate of the cursor.
* @return Indication of success.
*/
- virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) const = 0;
+ virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) = 0;
/***************************************************************************************
** Access to mouse button and keyboard states.
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp 2010-04-17 23:47:47 UTC (rev 28248)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp 2010-04-18 02:03:19 UTC (rev 28249)
@@ -531,7 +531,7 @@
}
-GHOST_TSuccess GHOST_SystemCarbon::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) const
+GHOST_TSuccess GHOST_SystemCarbon::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y)
{
float xf=(float)x, yf=(float)y;
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.h 2010-04-17 23:47:47 UTC (rev 28248)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.h 2010-04-18 02:03:19 UTC (rev 28249)
@@ -156,7 +156,7 @@
* @param y The y-coordinate of the cursor.
* @return Indication of success.
*/
- virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) const;
+ virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y);
/***************************************************************************************
** Access to mouse button and keyboard states.
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h 2010-04-17 23:47:47 UTC (rev 28248)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h 2010-04-18 02:03:19 UTC (rev 28249)
@@ -179,8 +179,8 @@
* @param y The y-coordinate of the cursor.
* @return Indication of success.
*/
- virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) const;
-
+ virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y);
+
/***************************************************************************************
** Access to mouse button and keyboard states.
***************************************************************************************/
@@ -272,6 +272,14 @@
*/
GHOST_TSuccess handleKeyEvent(void *eventPtr);
+ /**
+ * Performs the actual cursor position update (location in screen coordinates).
+ * @param x The x-coordinate of the cursor.
+ * @param y The y-coordinate of the cursor.
+ * @return Indication of success.
+ */
+ GHOST_TSuccess setMouseCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y);
+
/** Start time at initialization. */
GHOST_TUns64 m_start_time;
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-04-17 23:47:47 UTC (rev 28248)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-04-18 02:03:19 UTC (rev 28249)
@@ -807,8 +807,24 @@
/**
* @note : expect Cocoa screen coordinates
*/
-GHOST_TSuccess GHOST_SystemCocoa::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) const
+GHOST_TSuccess GHOST_SystemCocoa::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y)
{
+ GHOST_TInt32 wx,wy;
+ GHOST_WindowCocoa* window = (GHOST_WindowCocoa*)m_windowManager->getActiveWindow();
+ if (!window) return GHOST_kFailure;
+
+ setMouseCursorPosition(x, y);
+
+ //Force mouse move event (not pushed by Cocoa)
+ window->screenToClient(x, y, wx, wy);
+ pushEvent(new GHOST_EventCursor(getMilliSeconds(), GHOST_kEventCursorMove, window, wx,wy));
+ m_outsideLoopEventProcessed = true;
+
+ return GHOST_kSuccess;
+}
+
+GHOST_TSuccess GHOST_SystemCocoa::setMouseCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y)
+{
float xf=(float)x, yf=(float)y;
GHOST_WindowCocoa* window = (GHOST_WindowCocoa*)m_windowManager->getActiveWindow();
if (!window) return GHOST_kFailure;
@@ -1517,7 +1533,7 @@
//Set new cursor position
window->clientToScreen(x_mouse, y_mouse, x_cur, y_cur);
- setCursorPosition(x_cur, y_cur); /* wrap */
+ setMouseCursorPosition(x_cur, y_cur); /* wrap */
//Post event
window->getCursorGrabInitPos(x_cur, y_cur);
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp 2010-04-17 23:47:47 UTC (rev 28248)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp 2010-04-18 02:03:19 UTC (rev 28249)
@@ -273,7 +273,7 @@
}
-GHOST_TSuccess GHOST_SystemWin32::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) const
+GHOST_TSuccess GHOST_SystemWin32::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y)
{
return ::SetCursorPos(x, y) == TRUE ? GHOST_kSuccess : GHOST_kFailure;
}
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.h 2010-04-17 23:47:47 UTC (rev 28248)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.h 2010-04-18 02:03:19 UTC (rev 28249)
@@ -153,7 +153,7 @@
* @param y The y-coordinate of the cursor.
* @return Indication of success.
*/
- virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) const;
+ virtual GHOST_TSuccess setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y);
/***************************************************************************************
** Access to mouse button and keyboard states.
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp 2010-04-17 23:47:47 UTC (rev 28248)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp 2010-04-18 02:03:19 UTC (rev 28249)
@@ -970,7 +970,7 @@
setCursorPosition(
GHOST_TInt32 x,
GHOST_TInt32 y
-) const {
+) {
// This is a brute force move in screen coordinates
// XWarpPointer does relative moves so first determine the
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.h 2010-04-17 23:47:47 UTC (rev 28248)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.h 2010-04-18 02:03:19 UTC (rev 28249)
@@ -158,7 +158,7 @@
setCursorPosition(
GHOST_TInt32 x,
GHOST_TInt32 y
- ) const;
+ );
/**
* Returns the state of all modifier keys.
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp 2010-04-17 23:47:47 UTC (rev 28248)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp 2010-04-18 02:03:19 UTC (rev 28249)
@@ -158,11 +158,16 @@
width = tw;
left = rect.left;
}
+ else if(left < rect.left)
+ left = rect.left;
+
if(th < height)
{
height = th;
top = rect.top;
}
+ else if(top > rect.top)
+ top = rect.top;
m_hWnd = ::CreateWindow(
s_windowClassName, // pointer to registered class name
Modified: branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c 2010-04-17 23:47:47 UTC (rev 28248)
+++ branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c 2010-04-18 02:03:19 UTC (rev 28249)
@@ -463,12 +463,17 @@
/* sort by length and print */
qsort(printblock, totpb, sizeof(MemPrintBlock), compare_len);
printf("\ntotal memory len: %.3f MB\n", (double)mem_in_use/(double)(1024*1024));
+ printf(" ITEMS TOTAL-MiB AVERAGE-KiB TYPE\n");
for(a=0, pb=printblock; a<totpb; a++, pb++)
- printf("%s items: %d, len: %.3f MB\n", pb->name, pb->items, (double)pb->len/(double)(1024*1024));
+ printf("%6d (%8.3f %8.3f) %s\n", pb->items, (double)pb->len/(double)(1024*1024), (double)pb->len/1024.0/(double)pb->items, pb->name);
free(printblock);
mem_unlock_thread();
+
+#if 0 /* GLIBC only */
+ malloc_stats();
+#endif
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list