[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23821] branches/soc-2008-mxcurioni: merges changes to revision 23820
Maxime Curioni
maxime.curioni at gmail.com
Wed Oct 14 08:08:50 CEST 2009
Revision: 23821
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23821
Author: mxcurioni
Date: 2009-10-14 08:08:48 +0200 (Wed, 14 Oct 2009)
Log Message:
-----------
merges changes to revision 23820
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23820
Modified Paths:
--------------
branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
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_SystemX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.h
branches/soc-2008-mxcurioni/intern/smoke/extern/smoke_API.h
branches/soc-2008-mxcurioni/intern/smoke/intern/FLUID_3D.cpp
branches/soc-2008-mxcurioni/intern/smoke/intern/smoke_API.cpp
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blender.sln
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/gpu/BL_gpu.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/render/BRE_render.vcproj
branches/soc-2008-mxcurioni/release/datafiles/blenderbuttons
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_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_3ds.py
branches/soc-2008-mxcurioni/release/scripts/io/import_obj.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/client.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/master.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/model.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/ui.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_ops.py
branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_lamp.py
branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/ui/buttons_material.py
branches/soc-2008-mxcurioni/release/scripts/ui/buttons_object.py
branches/soc-2008-mxcurioni/release/scripts/ui/buttons_physics_smoke.py
branches/soc-2008-mxcurioni/release/scripts/ui/buttons_scene.py
branches/soc-2008-mxcurioni/release/scripts/ui/buttons_texture.py
branches/soc-2008-mxcurioni/release/scripts/ui/buttons_world.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_buttons.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_console.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_outliner.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_text.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_time.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/blender/blenkernel/BKE_armature.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_constraint.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_material.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_modifier.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_screen.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_texture.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
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/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.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/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/screen.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_arithb.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/arithb.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/util.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_deps.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_ipo_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/drivers.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_general.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.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/editarmature_sketch.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseSlide.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/curve_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_armature.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_gpencil.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframes_draw.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframing.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_markers.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mball.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_node.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_particle.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_physics.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_render.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_sculpt.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_transform.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_uvedit.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_icons.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_view2d.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_anim.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.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_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.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_data.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/mesh/meshtools.c
branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_hook.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/object/object_lattice.c
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_select.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_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/render/render_ops.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_context.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_header.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_api/spacetypes.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_ops.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/file_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_panels.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/space_file.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_header.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/space_graph.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.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/logic_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/space_logic.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_ops.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_header.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_node/space_node.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_script/script_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_script/script_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_script/space_script.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.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_text/text_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
branches/soc-2008-mxcurioni/source/blender/editors/space_time/time_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_time/time_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
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_buttons.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_select.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.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_constraints.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/transform/transform_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/gpu_buffers.h
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_smoke_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_enum_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.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_screen.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequence.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui.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/makesrna/intern/rna_wm_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_world.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_composite.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_filter.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_mixrgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_util.h
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_at.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_bricks.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_checker.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_compose.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_coord.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_decompose.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_mixRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_output.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_proc.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_scale.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_translate.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_valToNor.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_viewer.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_util.h
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_raytrace.h
branches/soc-2008-mxcurioni/source/blender/render/intern/Makefile
branches/soc-2008-mxcurioni/source/blender/render/intern/include/render_types.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/volume_precache.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/zbuf.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayobject_instance.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.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/strand.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/volume_precache.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/volumetric.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/zbuf.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_cursors.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_init_exit.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_event_system.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_event_types.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_window.h
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/tools/Blender.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/render/BRE_raytrace.vcproj
branches/soc-2008-mxcurioni/release/scripts/io/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/io/export_mdd.py
branches/soc-2008-mxcurioni/release/scripts/io/mesh_skin.py
branches/soc-2008-mxcurioni/release/scripts/modules/dynamic_menu.py
Property Changed:
----------------
branches/soc-2008-mxcurioni/
Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Name: svn:ignore
- *.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
+ *.pdb
.*
TAGS
build
cscope.out
install
mingw
mingw-user-config.py
mingw-user-config_debug.py
msvc
msvc-user-config.py
obj
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
user-def.mk
Modified: branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h 2009-10-14 03:00:35 UTC (rev 23820)
+++ branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h 2009-10-14 06:08:48 UTC (rev 23821)
@@ -376,7 +376,7 @@
* @return Indication of success.
*/
extern GHOST_TSuccess GHOST_SetCursorGrab(GHOST_WindowHandle windowhandle,
- int grab);
+ int grab, int warp, int restore);
/***************************************************************************************
** Access to mouse button and keyboard states.
Modified: branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h 2009-10-14 03:00:35 UTC (rev 23820)
+++ branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h 2009-10-14 06:08:48 UTC (rev 23821)
@@ -271,7 +271,7 @@
* @param grab The new grab state of the cursor.
* @return Indication of success.
*/
- virtual GHOST_TSuccess setCursorGrab(bool grab) { return GHOST_kSuccess; };
+ virtual GHOST_TSuccess setCursorGrab(bool grab, bool warp, bool restore) { return GHOST_kSuccess; };
};
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp 2009-10-14 03:00:35 UTC (rev 23820)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp 2009-10-14 06:08:48 UTC (rev 23821)
@@ -355,11 +355,11 @@
GHOST_TSuccess GHOST_SetCursorGrab(GHOST_WindowHandle windowhandle,
- int grab)
+ int grab, int warp, int restore)
{
GHOST_IWindow* window = (GHOST_IWindow*) windowhandle;
- return window->setCursorGrab(grab?true:false);
+ return window->setCursorGrab(grab?true:false, warp?true:false, restore?true:false);
}
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h 2009-10-14 03:00:35 UTC (rev 23820)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h 2009-10-14 06:08:48 UTC (rev 23821)
@@ -210,9 +210,10 @@
/**
* Handles a tablet event.
* @param eventPtr An NSEvent pointer (casted to void* to enable compilation in standard C++)
+ * @param eventType The type of the event. It needs to be passed separately as it can be either directly in the event type, or as a subtype if combined with a mouse button event
* @return Indication whether the event was handled.
*/
- GHOST_TSuccess handleTabletEvent(void *eventPtr);
+ GHOST_TSuccess handleTabletEvent(void *eventPtr, short eventType);
/**
* Handles a mouse event.
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm 2009-10-14 03:00:35 UTC (rev 23820)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm 2009-10-14 06:08:48 UTC (rev 23821)
@@ -51,44 +51,7 @@
#pragma mark KeyMap, mouse converters
-//TODO: remove (kept as reminder to implement window events)
-/*
-const EventTypeSpec kEvents[] =
-{
- { kEventClassAppleEvent, kEventAppleEvent },
-// { kEventClassApplication, kEventAppActivated },
-// { kEventClassApplication, kEventAppDeactivated },
-
- { kEventClassKeyboard, kEventRawKeyDown },
- { kEventClassKeyboard, kEventRawKeyRepeat },
- { kEventClassKeyboard, kEventRawKeyUp },
- { kEventClassKeyboard, kEventRawKeyModifiersChanged },
-
- { kEventClassMouse, kEventMouseDown },
- { kEventClassMouse, kEventMouseUp },
- { kEventClassMouse, kEventMouseMoved },
- { kEventClassMouse, kEventMouseDragged },
- { kEventClassMouse, kEventMouseWheelMoved },
-
- { kEventClassWindow, kEventWindowClickZoomRgn } , // for new zoom behaviour
- { kEventClassWindow, kEventWindowZoom }, // for new zoom behaviour
- { kEventClassWindow, kEventWindowExpand } , // for new zoom behaviour
- { kEventClassWindow, kEventWindowExpandAll }, // for new zoom behaviour
-
- { kEventClassWindow, kEventWindowClose },
- { kEventClassWindow, kEventWindowActivated },
- { kEventClassWindow, kEventWindowDeactivated },
- { kEventClassWindow, kEventWindowUpdate },
- { kEventClassWindow, kEventWindowBoundsChanged },
-
- { kEventClassBlender, kEventBlenderNdofAxis },
- { kEventClassBlender, kEventBlenderNdofButtons }
-
-
-
-};*/
-
/* Keycodes from Carbon include file */
/*
* Summary:
@@ -701,25 +664,6 @@
}
[pool drain];
-
- /*
- * Initialize the cursor to the standard arrow shape (so that we can change it later on).
- * This initializes the cursor's visibility counter to 0.
- */
- /*::InitCursor();
-
- MenuRef windMenu;
- ::CreateStandardWindowMenu(0, &windMenu);
- ::InsertMenu(windMenu, 0);
- ::DrawMenuBar();
-
- ::InstallApplicationEventHandler(sEventHandlerProc, GetEventTypeCount(kEvents), kEvents, this, &m_handler);
-
- ::AEInstallEventHandler(kCoreEventClass, kAEOpenApplication, sAEHandlerLaunch, (SInt32) this, false);
- ::AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, sAEHandlerOpenDocs, (SInt32) this, false);
- ::AEInstallEventHandler(kCoreEventClass, kAEPrintDocuments, sAEHandlerPrintDocs, (SInt32) this, false);
- ::AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, sAEHandlerQuit, (SInt32) this, false);
- */
}
return success;
}
@@ -806,7 +750,10 @@
GHOST_ASSERT(m_windowManager, "m_windowManager not initialized");
m_windowManager->addWindow(window);
m_windowManager->setActiveWindow(window);
- pushEvent(new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowSize, window));
+ //Need to tell window manager the new window is the active one (Cocoa does not send the event activate upon window creation)
+ pushEvent(new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowActivate, window));
+ pushEvent(new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowSize, window));
+
}
else {
GHOST_PRINT("GHOST_SystemCocoa::createWindow(): window invalid\n");
@@ -823,27 +770,18 @@
GHOST_TSuccess GHOST_SystemCocoa::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window, const bool stereoVisual)
{
- GHOST_TSuccess success = GHOST_kFailure;
+ GHOST_IWindow* currentWindow = m_windowManager->getActiveWindow();
- //TODO: update this method
- // need yo make this Carbon all on 10.5 for fullscreen to work correctly
- CGCaptureAllDisplays();
+ *window = currentWindow;
- success = GHOST_System::beginFullScreen( setting, window, stereoVisual);
-
- if( success != GHOST_kSuccess ) {
- // fullscreen failed for other reasons, release
- CGReleaseAllDisplays();
- }
-
- return success;
+ return currentWindow->setState(GHOST_kWindowStateFullScreen);
}
GHOST_TSuccess GHOST_SystemCocoa::endFullScreen(void)
{
- //TODO: update this method
- CGReleaseAllDisplays();
- return GHOST_System::endFullScreen();
+ GHOST_IWindow* currentWindow = m_windowManager->getActiveWindow();
+
+ return currentWindow->setState(GHOST_kWindowStateNormal);
}
@@ -853,7 +791,7 @@
{
NSPoint mouseLoc = [NSEvent mouseLocation];
- // Convert the coordinates to screen coordinates
+ // Returns the mouse location in screen coordinates
x = (GHOST_TInt32)mouseLoc.x;
y = (GHOST_TInt32)mouseLoc.y;
return GHOST_kSuccess;
@@ -863,10 +801,13 @@
GHOST_TSuccess GHOST_SystemCocoa::setCursorPosition(GHOST_TInt32 x, GHOST_TInt32 y) const
{
float xf=(float)x, yf=(float)y;
-
- CGAssociateMouseAndMouseCursorPosition(false);
+
+ //Quartz Display Services uses the old coordinates (top left origin)
+ yf = [[NSScreen mainScreen] frame].size.height -yf;
+
+ //CGAssociateMouseAndMouseCursorPosition(false);
CGWarpMouseCursorPosition(CGPointMake(xf, yf));
- CGAssociateMouseAndMouseCursorPosition(true);
+ //CGAssociateMouseAndMouseCursorPosition(true);
return GHOST_kSuccess;
}
@@ -933,8 +874,7 @@
anyProcessed = true;
}
- //TODO: check fullscreen redrawing issues
- if (getFullScreen()) {
+ if (getFullScreen()) {
// Check if the full-screen window is dirty
GHOST_IWindow* window = m_windowManager->getFullScreenWindow();
if (((GHOST_WindowCarbon*)window)->getFullScreenDirty()) {
@@ -984,7 +924,7 @@
case NSTabletPoint:
case NSTabletProximity:
- handleTabletEvent(event);
+ handleTabletEvent(event,[event type]);
break;
/* Trackpad features, will need OS X 10.6 for implementation
@@ -1025,8 +965,6 @@
if (!validWindow(window)) {
return GHOST_kFailure;
}
-
- //if (!getFullScreen()) {
switch(eventType)
{
case GHOST_kEventWindowClose:
@@ -1042,7 +980,6 @@
pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowDeactivate, window) );
break;
case GHOST_kEventWindowUpdate:
- //if (getFullScreen()) GHOST_PRINT("GHOST_SystemCarbon::handleWindowEvent(): full-screen update event\n");
pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowUpdate, window) );
break;
case GHOST_kEventWindowSize:
@@ -1056,12 +993,6 @@
return GHOST_kFailure;
break;
}
-// }
- //else {
- //window = (GHOST_WindowCarbon*) m_windowManager->getFullScreenWindow();
- //GHOST_PRINT("GHOST_SystemCarbon::handleWindowEvent(): full-screen window event, " << window << "\n");
- //::RemoveEventFromQueue(::GetMainEventQueue(), event);
- //}
return GHOST_kSuccess;
}
@@ -1087,28 +1018,13 @@
}
-GHOST_TSuccess GHOST_SystemCocoa::handleTabletEvent(void *eventPtr)
+GHOST_TSuccess GHOST_SystemCocoa::handleTabletEvent(void *eventPtr, short eventType)
{
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list