Revision: 26412
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26412
Author: kjym3
Date: 2010-01-30 03:58:48 +0100 (Sat, 30 Jan 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 26409.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26409
Modified Paths:
--------------
branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h
branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
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_WindowCarbon.cpp
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_WindowManager.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowManager.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-mxcurioni/intern/smoke/make/msvc_9_0/smoke.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/windowmanager/windowmanager.vcproj
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/netrender/master.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/master_html.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/app.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/ops.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/mouth.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/spine_pivot_flex.py
branches/soc-2008-mxcurioni/release/scripts/op/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/op/object.py
branches/soc-2008-mxcurioni/release/scripts/op/uv.py
branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_follow_active.py
branches/soc-2008-mxcurioni/release/scripts/op/wm.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_material.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_world.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_info.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/source/blender/blenkernel/BKE_animsys.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_material.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_screen.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_texture.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.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/context.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.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/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.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/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/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/simple_deform.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.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/blenkernel/intern/world.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeavi.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_storage_types.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_string.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_threads.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_winstuff.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/threads.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/undofile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/drivers.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/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/curve/editfont.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_mesh.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.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_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_layout.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/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh.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/object/object_add.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_group.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_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.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_edit.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_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.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_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.h
branches/soc-2008-mxcurioni/source/blender/editors/space_file/space_file.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/space_graph.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.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/info_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/space_info.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/space_logic.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_select.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/space_outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_script/space_script.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.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_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_python.c
branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
branches/soc-2008-mxcurioni/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.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_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.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_numinput.c
branches/soc-2008-mxcurioni/source/blender/editors/util/editmode_undo.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim5.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_anim_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_color_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_screen_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_vec_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_world_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
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_brush.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_camera.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_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.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_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.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_colorbalance.c
branches/soc-2008-mxcurioni/source/blender/python/doc/epy/Mathutils.py
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/euler.c
branches/soc-2008-mxcurioni/source/blender/python/generic/matrix.c
branches/soc-2008-mxcurioni/source/blender/python/generic/quat.c
branches/soc-2008-mxcurioni/source/blender/python/generic/vector.c
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_rna.c
branches/soc-2008-mxcurioni/source/blender/python/sphinx_doc_gen.py
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_import.c
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/render_types.h
branches/soc-2008-mxcurioni/source/blender/render/intern/include/rendercore.h
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/rayshade.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.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/strand.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/texture.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_draw.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_gesture.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_cursors.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/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-mxcurioni/source/nan_compile.mk
branches/soc-2008-mxcurioni/source/nan_definitions.mk
Added Paths:
-----------
branches/soc-2008-mxcurioni/release/scripts/cfg/
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_dragdrop.c
Removed Paths:
-------------
branches/soc-2008-mxcurioni/release/scripts/modules/retopo.py
branches/soc-2008-mxcurioni/release/scripts/op/mesh_skin.py
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_interface.h
Modified: branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h 2010-01-30
02:29:22 UTC (rev 26411)
+++ branches/soc-2008-mxcurioni/intern/ghost/GHOST_IWindow.h 2010-01-30
02:58:48 UTC (rev 26412)
@@ -73,6 +73,12 @@
virtual bool getValid() const = 0;
/**
+ * Returns the associated OS object/handle
+ * @return The associated OS object/handle
+ */
+ virtual void* getOSWindow() const = 0;
+
+ /**
* Returns the type of drawing context used in this window.
* @return The current type of drawing context.
*/
Modified: branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h 2010-01-30
02:29:22 UTC (rev 26411)
+++ branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h 2010-01-30
02:58:48 UTC (rev 26412)
@@ -204,6 +204,7 @@
GHOST_kStandardCursorTopRightCorner,
GHOST_kStandardCursorBottomRightCorner,
GHOST_kStandardCursorBottomLeftCorner,
+ GHOST_kStandardCursorCopy,
GHOST_kStandardCursorCustom,
GHOST_kStandardCursorNumCursors,
GHOST_kStandardCursorPencil
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
2010-01-30 02:29:22 UTC (rev 26411)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
2010-01-30 02:58:48 UTC (rev 26412)
@@ -1002,6 +1002,9 @@
case GHOST_kEventWindowUpdate:
pushEvent( new GHOST_Event(getMilliSeconds(),
GHOST_kEventWindowUpdate, window) );
break;
+ case GHOST_kEventWindowMove:
+ pushEvent( new GHOST_Event(getMilliSeconds(),
GHOST_kEventWindowMove, window) );
+ break;
case GHOST_kEventWindowSize:
if (!m_ignoreWindowSizedMessages)
{
@@ -1183,7 +1186,15 @@
NSEvent *event = (NSEvent *)eventPtr;
GHOST_IWindow* window = m_windowManager->getActiveWindow();
- if (!window) return GHOST_kFailure;
+ if (!window) {
+ /* If no active window found, still tries to find the window
associated with the event
+ This may happen when Cocoa continues to send some events after
the window deactivate one */
+ window =
m_windowManager->getWindowAssociatedWithOSWindow((void*)[event window]);
+ if (!window) {
+ //printf("\nW failure for event 0x%x",[event type]);
+ return GHOST_kFailure;
+ }
+ }
GHOST_TabletData& ct=((GHOST_WindowCocoa*)window)->GetCocoaTabletData();
@@ -1235,7 +1246,13 @@
GHOST_Window* window = (GHOST_Window*)m_windowManager->getActiveWindow();
if (!window) {
- return GHOST_kFailure;
+ /* If no active window found, still tries to find the window
associated with the event
+ This may happen when Cocoa continues to send some events after
the window deactivate one */
+ window =
(GHOST_Window*)m_windowManager->getWindowAssociatedWithOSWindow((void*)[event
window]);
+ if (!window) {
+ //printf("\nW failure for event 0x%x",[event type]);
+ return GHOST_kFailure;
+ }
}
switch ([event type])
@@ -1439,12 +1456,14 @@
unsigned char ascii;
NSString* charsIgnoringModifiers;
- /* Can happen, very rarely - seems to only be when command-H makes
- * the window go away and we still get an HKey up.
- */
if (!window) {
- //printf("\nW failure");
- return GHOST_kFailure;
+ /* If no active window found, still tries to find the window
associated with the event
+ This may happen when Cocoa continues to send some events after
the window deactivate one */
+ window =
m_windowManager->getWindowAssociatedWithOSWindow((void*)[event window]);
+ if (!window) {
+ //printf("\nW failure for event 0x%x",[event type]);
+ return GHOST_kFailure;
+ }
}
switch ([event type]) {
@@ -1483,6 +1502,7 @@
case NSFlagsChanged:
modifiers = [event modifierFlags];
+
if ((modifiers & NSShiftKeyMask) != (m_modifierMask &
NSShiftKeyMask)) {
pushEvent( new GHOST_EventKey([event
timestamp]*1000, (modifiers &
NSShiftKeyMask)?GHOST_kEventKeyDown:GHOST_kEventKeyUp, window,
GHOST_kKeyLeftShift) );
}
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.cpp
2010-01-30 02:29:22 UTC (rev 26411)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.cpp
2010-01-30 02:58:48 UTC (rev 26412)
@@ -72,6 +72,10 @@
{
}
+void* GHOST_Window::getOSWindow() const
+{
+ return NULL;
+}
GHOST_TSuccess GHOST_Window::setDrawingContextType(GHOST_TDrawingContextType
type)
{
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.h
2010-01-30 02:29:22 UTC (rev 26411)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.h
2010-01-30 02:58:48 UTC (rev 26412)
@@ -124,6 +124,12 @@
virtual ~GHOST_Window();
/**
+ * Returns the associated OS object/handle
+ * @return The associated OS object/handle
+ */
+ virtual void* getOSWindow() const;
+
+ /**
* Returns the current cursor shape.
* @return The current cursor shape.
*/
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCarbon.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCarbon.cpp
2010-01-30 02:29:22 UTC (rev 26411)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCarbon.cpp
2010-01-30 02:58:48 UTC (rev 26412)
@@ -635,6 +635,7 @@
GCMAP( GHOST_kStandardCursorTopRightCorner,
kThemeArrowCursor);
GCMAP( GHOST_kStandardCursorBottomRightCorner,
kThemeArrowCursor);
GCMAP( GHOST_kStandardCursorBottomLeftCorner,
kThemeArrowCursor);
+ GCMAP( GHOST_kStandardCursorCopy,
kThemeCopyArrowCursor);
};
#undef GCMAP
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.h
2010-01-30 02:29:22 UTC (rev 26411)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.h
2010-01-30 02:58:48 UTC (rev 26412)
@@ -96,6 +96,12 @@
* @return The validity of the window.
*/
virtual bool getValid() const;
+
+ /**
+ * Returns the associated NSWindow object
+ * @return The associated NSWindow object
+ */
+ virtual void* getOSWindow() const;
/**
* Sets the title displayed in the title bar.
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
2010-01-30 02:29:22 UTC (rev 26411)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
2010-01-30 02:58:48 UTC (rev 26412)
@@ -72,6 +72,8 @@
- (void)windowDidResignKey:(NSNotification *)notification;
- (void)windowDidExpose:(NSNotification *)notification;
- (void)windowDidResize:(NSNotification *)notification;
+- (void)windowDidMove:(NSNotification *)notification;
+- (void)windowWillMove:(NSNotification *)notification;
@end
@implementation CocoaWindowDelegate : NSObject
@@ -101,6 +103,16 @@
systemCocoa->handleWindowEvent(GHOST_kEventWindowUpdate,
associatedWindow);
}
+- (void)windowDidMove:(NSNotification *)notification
+{
+ systemCocoa->handleWindowEvent(GHOST_kEventWindowMove,
associatedWindow);
+}
+
+- (void)windowWillMove:(NSNotification *)notification
+{
+ systemCocoa->handleWindowEvent(GHOST_kEventWindowMove,
associatedWindow);
+}
+
- (void)windowDidResize:(NSNotification *)notification
{
#ifdef MAC_OS_X_VERSION_10_6
@@ -324,6 +336,11 @@
// Pixel Format Attributes for the windowed NSOpenGLContext
i=0;
pixelFormatAttrsWindow[i++] = NSOpenGLPFADoubleBuffer;
+
+ // Guarantees the back buffer contents to be valid after a call to
NSOpenGLContext object’s flushBuffer
+ // needed for 'Draw Overlap' drawing method
+ pixelFormatAttrsWindow[i++] = NSOpenGLPFABackingStore;
+
pixelFormatAttrsWindow[i++] = NSOpenGLPFAAccelerated;
//pixelFormatAttrsWindow[i++] = NSOpenGLPFAAllowOfflineRenderers,; //
Removed to allow 10.4 builds, and 2 GPUs rendering is not used anyway
@@ -354,6 +371,11 @@
if (pixelFormat == nil) {
i=0;
pixelFormatAttrsWindow[i++] = NSOpenGLPFADoubleBuffer;
+
+ // Guarantees the back buffer contents to be valid after a call
to NSOpenGLContext object’s flushBuffer
+ // needed for 'Draw Overlap' drawing method
+ pixelFormatAttrsWindow[i++] = NSOpenGLPFABackingStore;
+
pixelFormatAttrsWindow[i++] = NSOpenGLPFAAccelerated;
//pixelFormatAttrsWindow[i++] =
NSOpenGLPFAAllowOfflineRenderers,; // Removed to allow 10.4 builds, and 2
GPUs rendering is not used anyway
@@ -443,6 +465,10 @@
return (m_window != 0);
}
+void* GHOST_WindowCocoa::getOSWindow() const
+{
+ return (void*)m_window;
+}
void GHOST_WindowCocoa::setTitle(const STR_String& title)
{
@@ -1042,6 +1068,7 @@
case GHOST_kStandardCursorTopRightCorner:
case GHOST_kStandardCursorBottomRightCorner:
case GHOST_kStandardCursorBottomLeftCorner:
+ case GHOST_kStandardCursorCopy:
case GHOST_kStandardCursorDefault:
default:
tmpCursor = [NSCursor arrowCursor];
Modified:
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowManager.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowManager.cpp
2010-01-30 02:29:22 UTC (rev 26411)
+++ branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowManager.cpp
2010-01-30 02:58:48 UTC (rev 26412)
@@ -193,6 +193,18 @@
}
+GHOST_IWindow* GHOST_WindowManager::getWindowAssociatedWithOSWindow(void*
osWindow)
+{
+ std::vector<GHOST_IWindow*>::iterator iter;
+
+ for (iter = m_windows.begin(); iter != m_windows.end(); iter++) {
+ if ((*iter)->getOSWindow() == osWindow)
+ return *iter;
+ }
+
+ return NULL;
+}
+
bool GHOST_WindowManager::getAnyModifiedState()
{
bool isAnyModified = false;
Modified: branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowManager.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
