[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24526] branches/soc-2009-chingachgook: COLLADA: merge from trunk -r 24390:24522.

Arystanbek Dyussenov arystan.d at gmail.com
Thu Nov 12 15:49:54 CET 2009


Revision: 24526
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24526
Author:   kazanbas
Date:     2009-11-12 15:49:54 +0100 (Thu, 12 Nov 2009)

Log Message:
-----------
COLLADA: merge from trunk -r 24390:24522.

Modified Paths:
--------------
    branches/soc-2009-chingachgook/CMakeLists.txt
    branches/soc-2009-chingachgook/config/darwin-config.py
    branches/soc-2009-chingachgook/extern/Makefile
    branches/soc-2009-chingachgook/intern/ghost/GHOST_C-api.h
    branches/soc-2009-chingachgook/intern/ghost/GHOST_ISystem.h
    branches/soc-2009-chingachgook/intern/ghost/GHOST_Types.h
    branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_System.h
    branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_WindowCocoa.h
    branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2009-chingachgook/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2009-chingachgook/intern/guardedalloc/intern/mallocn.c
    branches/soc-2009-chingachgook/intern/smoke/intern/Makefile
    branches/soc-2009-chingachgook/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/soc-2009-chingachgook/release/datafiles/datatoc.py
    branches/soc-2009-chingachgook/release/scripts/io/netrender/client.py
    branches/soc-2009-chingachgook/release/scripts/modules/bpy_ext/Mesh.py
    branches/soc-2009-chingachgook/release/scripts/modules/bpy_ext/Object.py
    branches/soc-2009-chingachgook/release/scripts/modules/bpy_ext/__init__.py
    branches/soc-2009-chingachgook/release/scripts/modules/bpy_ops.py
    branches/soc-2009-chingachgook/release/scripts/modules/bpy_utils.py
    branches/soc-2009-chingachgook/release/scripts/modules/dynamic_menu.py
    branches/soc-2009-chingachgook/release/scripts/op/console_shell.py
    branches/soc-2009-chingachgook/release/scripts/op/mesh.py
    branches/soc-2009-chingachgook/release/scripts/op/mesh_skin.py
    branches/soc-2009-chingachgook/release/scripts/op/uvcalc_smart_project.py
    branches/soc-2009-chingachgook/release/scripts/op/vertexpaint_dirt.py
    branches/soc-2009-chingachgook/release/scripts/templates/gamelogic.py
    branches/soc-2009-chingachgook/release/scripts/templates/gamelogic_basic.py
    branches/soc-2009-chingachgook/release/scripts/templates/gamelogic_module.py
    branches/soc-2009-chingachgook/release/scripts/templates/operator.py
    branches/soc-2009-chingachgook/release/scripts/templates/operator_simple.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_data_mesh.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_material.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_object.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_object_constraint.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_physics_field.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_render.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_scene.py
    branches/soc-2009-chingachgook/release/scripts/ui/properties_world.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_console.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_info.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_node.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_sequencer.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_userpref.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_view3d.py
    branches/soc-2009-chingachgook/release/scripts/ui/space_view3d_toolbar.py
    branches/soc-2009-chingachgook/source/Makefile
    branches/soc-2009-chingachgook/source/blender/blenfont/intern/blf_font.c
    branches/soc-2009-chingachgook/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_cloth.h
    branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_constraint.h
    branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_context.h
    branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_group.h
    branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_key.h
    branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_node.h
    branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_paint.h
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/BME_tools.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/action.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/anim.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/armature.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/boids.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/booleanops.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/booleanops_mesh.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/brush.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/bvhutils.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/cloth.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/collision.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/colortools.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/constraint.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/context.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/curve.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/customdata.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/deform.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/displist.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/effect.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/exotic.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/fluidsim.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/font.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/gpencil.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/group.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/image.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/implicit.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/ipo.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/key.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/lattice.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/material.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/mball.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/mesh.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/modifier.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/multires.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/node.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/object.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/particle.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/scene.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/sequence.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/shrinkwrap.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/simple_deform.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/sketch.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/smoke.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/softbody.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/texture.c
    branches/soc-2009-chingachgook/source/blender/blenkernel/intern/world.c
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/BLI_kdtree.c
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/boxpack2d.c
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/freetypefont.c
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/graph.c
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/jitter.c
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/scanfill.c
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/util.c
    branches/soc-2009-chingachgook/source/blender/blenloader/intern/readfile.c
    branches/soc-2009-chingachgook/source/blender/blenloader/intern/writefile.c
    branches/soc-2009-chingachgook/source/blender/collada/CMakeLists.txt
    branches/soc-2009-chingachgook/source/blender/collada/DocumentExporter.cpp
    branches/soc-2009-chingachgook/source/blender/collada/DocumentImporter.cpp
    branches/soc-2009-chingachgook/source/blender/collada/SConscript
    branches/soc-2009-chingachgook/source/blender/collada/collada_internal.h
    branches/soc-2009-chingachgook/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2009-chingachgook/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2009-chingachgook/source/blender/editors/animation/anim_draw.c
    branches/soc-2009-chingachgook/source/blender/editors/animation/anim_filter.c
    branches/soc-2009-chingachgook/source/blender/editors/animation/anim_ipo_utils.c
    branches/soc-2009-chingachgook/source/blender/editors/animation/drivers.c
    branches/soc-2009-chingachgook/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2009-chingachgook/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2009-chingachgook/source/blender/editors/animation/keyframes_edit.c
    branches/soc-2009-chingachgook/source/blender/editors/animation/keyframes_general.c
    branches/soc-2009-chingachgook/source/blender/editors/animation/keyframing.c
    branches/soc-2009-chingachgook/source/blender/editors/animation/keyingsets.c
    branches/soc-2009-chingachgook/source/blender/editors/armature/armature_intern.h
    branches/soc-2009-chingachgook/source/blender/editors/armature/armature_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/armature/editarmature.c
    branches/soc-2009-chingachgook/source/blender/editors/armature/editarmature_generate.c
    branches/soc-2009-chingachgook/source/blender/editors/armature/editarmature_retarget.c
    branches/soc-2009-chingachgook/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2009-chingachgook/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2009-chingachgook/source/blender/editors/armature/poseSlide.c
    branches/soc-2009-chingachgook/source/blender/editors/armature/poselib.c
    branches/soc-2009-chingachgook/source/blender/editors/armature/poseobject.c
    branches/soc-2009-chingachgook/source/blender/editors/armature/reeb.c
    branches/soc-2009-chingachgook/source/blender/editors/curve/curve_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/curve/editcurve.c
    branches/soc-2009-chingachgook/source/blender/editors/curve/editfont.c
    branches/soc-2009-chingachgook/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2009-chingachgook/source/blender/editors/gpencil/editaction_gpencil.c
    branches/soc-2009-chingachgook/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2009-chingachgook/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2009-chingachgook/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2009-chingachgook/source/blender/editors/include/ED_anim_api.h
    branches/soc-2009-chingachgook/source/blender/editors/include/ED_armature.h
    branches/soc-2009-chingachgook/source/blender/editors/include/ED_gpencil.h
    branches/soc-2009-chingachgook/source/blender/editors/include/ED_object.h
    branches/soc-2009-chingachgook/source/blender/editors/include/UI_icons.h
    branches/soc-2009-chingachgook/source/blender/editors/interface/interface.c
    branches/soc-2009-chingachgook/source/blender/editors/interface/interface_draw.c
    branches/soc-2009-chingachgook/source/blender/editors/interface/interface_handlers.c
    branches/soc-2009-chingachgook/source/blender/editors/interface/interface_icons.c
    branches/soc-2009-chingachgook/source/blender/editors/interface/interface_panel.c
    branches/soc-2009-chingachgook/source/blender/editors/interface/interface_regions.c
    branches/soc-2009-chingachgook/source/blender/editors/interface/interface_style.c
    branches/soc-2009-chingachgook/source/blender/editors/interface/interface_templates.c
    branches/soc-2009-chingachgook/source/blender/editors/interface/interface_widgets.c
    branches/soc-2009-chingachgook/source/blender/editors/mesh/editface.c
    branches/soc-2009-chingachgook/source/blender/editors/mesh/editmesh.c
    branches/soc-2009-chingachgook/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2009-chingachgook/source/blender/editors/mesh/editmesh_lib.c
    branches/soc-2009-chingachgook/source/blender/editors/mesh/editmesh_loop.c
    branches/soc-2009-chingachgook/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2009-chingachgook/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2009-chingachgook/source/blender/editors/mesh/mesh_data.c
    branches/soc-2009-chingachgook/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/mesh/meshtools.c
    branches/soc-2009-chingachgook/source/blender/editors/metaball/mball_edit.c
    branches/soc-2009-chingachgook/source/blender/editors/object/object_add.c
    branches/soc-2009-chingachgook/source/blender/editors/object/object_constraint.c
    branches/soc-2009-chingachgook/source/blender/editors/object/object_edit.c
    branches/soc-2009-chingachgook/source/blender/editors/object/object_group.c
    branches/soc-2009-chingachgook/source/blender/editors/object/object_hook.c
    branches/soc-2009-chingachgook/source/blender/editors/object/object_modifier.c
    branches/soc-2009-chingachgook/source/blender/editors/object/object_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/object/object_relations.c
    branches/soc-2009-chingachgook/source/blender/editors/object/object_select.c
    branches/soc-2009-chingachgook/source/blender/editors/object/object_shapekey.c
    branches/soc-2009-chingachgook/source/blender/editors/object/object_transform.c
    branches/soc-2009-chingachgook/source/blender/editors/physics/particle_edit.c
    branches/soc-2009-chingachgook/source/blender/editors/physics/particle_object.c
    branches/soc-2009-chingachgook/source/blender/editors/physics/physics_fluid.c
    branches/soc-2009-chingachgook/source/blender/editors/physics/physics_intern.h
    branches/soc-2009-chingachgook/source/blender/editors/physics/physics_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/render/render_preview.c
    branches/soc-2009-chingachgook/source/blender/editors/render/render_shading.c
    branches/soc-2009-chingachgook/source/blender/editors/screen/area.c
    branches/soc-2009-chingachgook/source/blender/editors/screen/glutil.c
    branches/soc-2009-chingachgook/source/blender/editors/screen/screen_context.c
    branches/soc-2009-chingachgook/source/blender/editors/screen/screen_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2009-chingachgook/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2009-chingachgook/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2009-chingachgook/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2009-chingachgook/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2009-chingachgook/source/blender/editors/space_action/action_draw.c
    branches/soc-2009-chingachgook/source/blender/editors/space_action/action_edit.c
    branches/soc-2009-chingachgook/source/blender/editors/space_action/action_select.c
    branches/soc-2009-chingachgook/source/blender/editors/space_action/space_action.c
    branches/soc-2009-chingachgook/source/blender/editors/space_api/space.c
    branches/soc-2009-chingachgook/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2009-chingachgook/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2009-chingachgook/source/blender/editors/space_console/space_console.c
    branches/soc-2009-chingachgook/source/blender/editors/space_file/filelist.c
    branches/soc-2009-chingachgook/source/blender/editors/space_file/space_file.c
    branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_select.c
    branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_utils.c
    branches/soc-2009-chingachgook/source/blender/editors/space_graph/space_graph.c
    branches/soc-2009-chingachgook/source/blender/editors/space_image/image_buttons.c
    branches/soc-2009-chingachgook/source/blender/editors/space_image/image_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/space_image/space_image.c
    branches/soc-2009-chingachgook/source/blender/editors/space_info/space_info.c
    branches/soc-2009-chingachgook/source/blender/editors/space_logic/logic_buttons.c
    branches/soc-2009-chingachgook/source/blender/editors/space_logic/space_logic.c
    branches/soc-2009-chingachgook/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2009-chingachgook/source/blender/editors/space_nla/nla_channels.c
    branches/soc-2009-chingachgook/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2009-chingachgook/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2009-chingachgook/source/blender/editors/space_nla/nla_header.c
    branches/soc-2009-chingachgook/source/blender/editors/space_nla/nla_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/space_nla/nla_select.c
    branches/soc-2009-chingachgook/source/blender/editors/space_nla/space_nla.c
    branches/soc-2009-chingachgook/source/blender/editors/space_node/drawnode.c
    branches/soc-2009-chingachgook/source/blender/editors/space_node/node_draw.c
    branches/soc-2009-chingachgook/source/blender/editors/space_node/node_edit.c
    branches/soc-2009-chingachgook/source/blender/editors/space_node/node_intern.h
    branches/soc-2009-chingachgook/source/blender/editors/space_node/node_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/space_node/node_select.c
    branches/soc-2009-chingachgook/source/blender/editors/space_node/space_node.c
    branches/soc-2009-chingachgook/source/blender/editors/space_outliner/outliner.c
    branches/soc-2009-chingachgook/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2009-chingachgook/source/blender/editors/space_script/script_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/space_script/space_script.c
    branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2009-chingachgook/source/blender/editors/space_sound/space_sound.c
    branches/soc-2009-chingachgook/source/blender/editors/space_text/space_text.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2009-chingachgook/source/blender/editors/transform/transform.c
    branches/soc-2009-chingachgook/source/blender/editors/transform/transform_constraints.c
    branches/soc-2009-chingachgook/source/blender/editors/transform/transform_conversions.c
    branches/soc-2009-chingachgook/source/blender/editors/transform/transform_generics.c
    branches/soc-2009-chingachgook/source/blender/editors/transform/transform_input.c
    branches/soc-2009-chingachgook/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2009-chingachgook/source/blender/editors/transform/transform_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/transform/transform_orientations.c
    branches/soc-2009-chingachgook/source/blender/editors/transform/transform_snap.c
    branches/soc-2009-chingachgook/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2009-chingachgook/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2009-chingachgook/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2009-chingachgook/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2009-chingachgook/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2009-chingachgook/source/blender/gpu/intern/gpu_material.c
    branches/soc-2009-chingachgook/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/soc-2009-chingachgook/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/soc-2009-chingachgook/source/blender/ikplugin/intern/ikplugin_api.c
    branches/soc-2009-chingachgook/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/soc-2009-chingachgook/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/soc-2009-chingachgook/source/blender/imbuf/intern/Makefile
    branches/soc-2009-chingachgook/source/blender/makesdna/DNA_action_types.h
    branches/soc-2009-chingachgook/source/blender/makesdna/DNA_armature_types.h
    branches/soc-2009-chingachgook/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2009-chingachgook/source/blender/makesdna/DNA_node_types.h
    branches/soc-2009-chingachgook/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2009-chingachgook/source/blender/makesdna/DNA_space_types.h
    branches/soc-2009-chingachgook/source/blender/makesrna/RNA_access.h
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_access.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_fcurve_api.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_group.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_material.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_object.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_pose_api.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_space.c
    branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2009-chingachgook/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
    branches/soc-2009-chingachgook/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
    branches/soc-2009-chingachgook/source/blender/nodes/intern/CMP_util.h
    branches/soc-2009-chingachgook/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
    branches/soc-2009-chingachgook/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
    branches/soc-2009-chingachgook/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
    branches/soc-2009-chingachgook/source/blender/nodes/intern/SHD_nodes/SHD_material.c
    branches/soc-2009-chingachgook/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
    branches/soc-2009-chingachgook/source/blender/nodes/intern/SHD_util.h
    branches/soc-2009-chingachgook/source/blender/nodes/intern/TEX_nodes/TEX_distance.c
    branches/soc-2009-chingachgook/source/blender/nodes/intern/TEX_nodes/TEX_rotate.c
    branches/soc-2009-chingachgook/source/blender/nodes/intern/TEX_util.h
    branches/soc-2009-chingachgook/source/blender/python/BPY_extern.h
    branches/soc-2009-chingachgook/source/blender/python/generic/Geometry.c
    branches/soc-2009-chingachgook/source/blender/python/generic/Mathutils.c
    branches/soc-2009-chingachgook/source/blender/python/generic/euler.c
    branches/soc-2009-chingachgook/source/blender/python/generic/matrix.c
    branches/soc-2009-chingachgook/source/blender/python/generic/quat.c
    branches/soc-2009-chingachgook/source/blender/python/generic/vector.c
    branches/soc-2009-chingachgook/source/blender/python/intern/bpy_interface.c
    branches/soc-2009-chingachgook/source/blender/python/intern/bpy_operator.c
    branches/soc-2009-chingachgook/source/blender/python/intern/bpy_rna.c
    branches/soc-2009-chingachgook/source/blender/python/intern/bpy_rna.h
    branches/soc-2009-chingachgook/source/blender/python/intern/bpy_util.c
    branches/soc-2009-chingachgook/source/blender/quicktime/apple/quicktime_export.c
    branches/soc-2009-chingachgook/source/blender/quicktime/quicktime_export.h
    branches/soc-2009-chingachgook/source/blender/render/CMakeLists.txt
    branches/soc-2009-chingachgook/source/blender/render/SConscript
    branches/soc-2009-chingachgook/source/blender/render/intern/raytrace/rayobject.cpp
    branches/soc-2009-chingachgook/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/soc-2009-chingachgook/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/soc-2009-chingachgook/source/blender/render/intern/source/convertblender.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/envmap.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/imagetexture.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/initrender.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/occlusion.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/pipeline.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/pixelblending.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/pixelshading.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/pointdensity.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/rayobject_blibvh.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/rayobject_instance.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/rayobject_octree.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/rayshade.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/rendercore.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/renderdatabase.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/shadbuf.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/shadeinput.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/sss.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/strand.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/sunsky.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/texture.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/volume_precache.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/volumetric.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/voxeldata.c
    branches/soc-2009-chingachgook/source/blender/render/intern/source/zbuf.c
    branches/soc-2009-chingachgook/source/blender/windowmanager/WM_api.h
    branches/soc-2009-chingachgook/source/blender/windowmanager/WM_types.h
    branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm.c
    branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2009-chingachgook/source/blender/windowmanager/wm.h
    branches/soc-2009-chingachgook/source/creator/creator.c
    branches/soc-2009-chingachgook/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/soc-2009-chingachgook/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/soc-2009-chingachgook/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2009-chingachgook/source/gameengine/BlenderRoutines/KX_BlenderGL.h
    branches/soc-2009-chingachgook/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2009-chingachgook/source/gameengine/Converter/BL_ArmatureActuator.cpp
    branches/soc-2009-chingachgook/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/soc-2009-chingachgook/source/gameengine/Converter/BL_ArmatureConstraint.cpp
    branches/soc-2009-chingachgook/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2009-chingachgook/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2009-chingachgook/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/soc-2009-chingachgook/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/soc-2009-chingachgook/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2009-chingachgook/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/soc-2009-chingachgook/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/soc-2009-chingachgook/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2009-chingachgook/source/gameengine/GameLogic/SCA_ExpressionController.cpp
    branches/soc-2009-chingachgook/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2009-chingachgook/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2009-chingachgook/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/soc-2009-chingachgook/source/gameengine/VideoTexture/ImageRender.cpp
    branches/soc-2009-chingachgook/source/nan_definitions.mk
    branches/soc-2009-chingachgook/source/nan_link.mk

Added Paths:
-----------
    branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_EventDragnDrop.h
    branches/soc-2009-chingachgook/release/scripts/modules/bpy_types.py
    branches/soc-2009-chingachgook/release/scripts/modules/console/complete_calltip.py
    branches/soc-2009-chingachgook/source/blender/blenlib/BLI_math.h
    branches/soc-2009-chingachgook/source/blender/blenlib/BLI_math_base.h
    branches/soc-2009-chingachgook/source/blender/blenlib/BLI_math_color.h
    branches/soc-2009-chingachgook/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2009-chingachgook/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2009-chingachgook/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2009-chingachgook/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/math_base.c
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/math_color.c
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/math_geom.c
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/math_vector.c
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2009-chingachgook/source/blender/editors/space_node/node_buttons.c

Removed Paths:
-------------
    branches/soc-2009-chingachgook/source/blender/blenlib/BLI_arithb.h
    branches/soc-2009-chingachgook/source/blender/blenlib/intern/arithb.c

Modified: branches/soc-2009-chingachgook/CMakeLists.txt
===================================================================
--- branches/soc-2009-chingachgook/CMakeLists.txt	2009-11-12 14:40:09 UTC (rev 24525)
+++ branches/soc-2009-chingachgook/CMakeLists.txt	2009-11-12 14:49:54 UTC (rev 24526)
@@ -91,18 +91,6 @@
 	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
-IF (WITH_OPENCOLLADA AND NOT APPLE)
-SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
-SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
-SET(OPENCOLLADA_LIB OpenCollada)
-SET(PCRE /usr CACHE FILEPATH "PCRE Directory")
-SET(PCRE_LIBPATH ${PCRE}/lib)
-SET(PCRE_LIB pcre)
-SET(EXPAT /usr CACHE FILEPATH "Expat Directory")
-SET(EXPAT_LIBPATH ${EXPAT}/lib)
-SET(EXPAT_LIB expat)
-ENDIF (WITH_OPENCOLLADA AND NOT APPLE)
-
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
 # On Unix: 
 #   cmake -D PYTHON_LIB=/usr/local/lib/python2.3/config/libpython2.3.so -D PYTHON_INC=/usr/local/include/python2.3 -D PYTHON_BINARY=/usr/local/bin/python2.3 -G "Unix Makefiles" ../blender
@@ -119,6 +107,8 @@
 #Platform specifics
 
 IF(UNIX AND NOT APPLE)
+
+
 	IF(WITH_OPENAL)
 		FIND_PACKAGE(OpenAL)
 		IF(OPENAL_FOUND)
@@ -217,6 +207,20 @@
 
 	FIND_PACKAGE(ZLIB REQUIRED)
 
+	IF (WITH_OPENCOLLADA)
+		SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
+		SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
+		SET(OPENCOLLADA_LIB OpenCollada)
+		SET(OPENCOLLADA_INC ${OPENCOLLADA})
+		SET(PCRE /usr CACHE FILEPATH "PCRE Directory")
+		SET(PCRE_LIBPATH ${PCRE}/lib)
+		SET(PCRE_LIB pcre)
+		SET(EXPAT /usr CACHE FILEPATH "Expat Directory")
+		SET(EXPAT_LIBPATH ${EXPAT}/lib)
+		SET(EXPAT_LIB expat)
+	ENDIF (WITH_OPENCOLLADA)
+
+
 	# Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
 	SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
 
@@ -400,6 +404,16 @@
   
 	SET(WINTAB_INC ${LIBDIR}/wintab/include) 
 
+	SET(OPENCOLLADA ${LIBDIR}/opencollada)
+	SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
+	SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
+	SET(OPENCOLLADA_LIB OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 )
+	#pcre is bundled with openCollada
+	#SET(PCRE ${LIBDIR}/pcre)
+	#SET(PCRE_LIBPATH ${PCRE}/lib)
+	SET(PCRE_LIB pcre)
+
+
 	IF(CMAKE_CL_64)
 		SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
 	ELSE(CMAKE_CL_64)
@@ -532,10 +546,10 @@
 		#SET(PCRE ${LIBDIR}/pcre)
 		#SET(PCRE_LIBPATH ${PCRE}/lib)
 		SET(PCRE_LIB pcre)
-		#native OSX libxml2 is used
+		#libxml2 is used
 		#SET(EXPAT ${LIBDIR}/expat)
 		#SET(EXPAT_LIBPATH ${EXPAT}/lib)
-		#SET(EXPAT_LIB expat)
+		SET(EXPAT_LIB)
 	ENDIF (WITH_OPENCOLLADA)
 
 	SET(SDL ${LIBDIR}/sdl)

Modified: branches/soc-2009-chingachgook/config/darwin-config.py
===================================================================
--- branches/soc-2009-chingachgook/config/darwin-config.py	2009-11-12 14:40:09 UTC (rev 24525)
+++ branches/soc-2009-chingachgook/config/darwin-config.py	2009-11-12 14:49:54 UTC (rev 24526)
@@ -31,7 +31,7 @@
 elif cmd_res[0]=='10':
 	MAC_CUR_VER='10.6'
 
-if MAC_PROC == 'powerpc':
+if MACOSX_ARCHITECTURE == 'ppc':
 	LCGDIR = '#../lib/darwin-6.1-powerpc'
 else :
 	LCGDIR = '#../lib/darwin-9.x.universal'
@@ -39,7 +39,7 @@
 
 BF_PYTHON_VERSION = '3.1'
 
-if MAC_PROC == 'powerpc' and BF_PYTHON_VERSION == '2.3':
+if MACOSX_ARCHITECTURE == 'ppc' and BF_PYTHON_VERSION == '2.3':
 	MAC_MIN_VERS = '10.3'
 	MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
 	CC = 'gcc'
@@ -247,7 +247,20 @@
 BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL']
 
 #OpenCollada flags
-WITH_BF_COLLADA = False
+WITH_BF_COLLADA = True
+BF_COLLADA = '#source/blender/collada'
+BF_COLLADA_INC = '${BF_COLLADA}'
+BF_COLLADA_LIB = 'bf_collada'
+BF_OPENCOLLADA = LIBDIR + '/opencollada'
+BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include'
+BF_OPENCOLLADA_LIB = 'OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2'
+BF_OPENCOLLADA_LIBPATH = LIBDIR + '/opencollada'
+BF_PCRE = LIBDIR + '/opencollada'
+BF_PCRE_LIB = 'pcre'
+BF_PCRE_LIBPATH = '${BF_PCRE}/lib'
+#BF_EXPAT = '/usr'
+#BF_EXPAT_LIB = 'expat'
+#BF_EXPAT_LIBPATH = '/usr/lib'
 
 #############################################################################
 ###################  various compile settings and flags    ##################

Modified: branches/soc-2009-chingachgook/extern/Makefile
===================================================================
--- branches/soc-2009-chingachgook/extern/Makefile	2009-11-12 14:40:09 UTC (rev 24525)
+++ branches/soc-2009-chingachgook/extern/Makefile	2009-11-12 14:49:54 UTC (rev 24526)
@@ -34,7 +34,7 @@
 
 # Cloth requires it
 ifeq ($(NAN_USE_BULLET), true)
-	DIRS += bullet2
+    DIRS += bullet2
 endif
 
 ifeq ($(WITH_BINRELOC), true)
@@ -42,7 +42,9 @@
 endif
 
 ifeq ($(WITH_OPENJPEG), true)
-    DIRS += libopenjpeg
+    ifndef BF_OPENJPEG
+        DIRS += libopenjpeg
+    endif
 endif
 
 ifeq ($(WITH_LZO), true)

Modified: branches/soc-2009-chingachgook/intern/ghost/GHOST_C-api.h
===================================================================
--- branches/soc-2009-chingachgook/intern/ghost/GHOST_C-api.h	2009-11-12 14:40:09 UTC (rev 24525)
+++ branches/soc-2009-chingachgook/intern/ghost/GHOST_C-api.h	2009-11-12 14:49:54 UTC (rev 24526)
@@ -406,7 +406,18 @@
 										   GHOST_TButtonMask mask,
 										   int* isDown);
 
+
+/***************************************************************************************
+ ** Drag'n'drop operations
+ ***************************************************************************************/
+
 /**
+ * Tells if the ongoing drag'n'drop object can be accepted upon mouse drop
+ */
+extern void GHOST_setAcceptDragOperation(GHOST_SystemHandle systemhandle, GHOST_TInt8 canAccept);
+	
+	
+/**
  * Returns the event type.
  * @param eventhandle The handle to the event
  * @return The event type.

Modified: branches/soc-2009-chingachgook/intern/ghost/GHOST_ISystem.h
===================================================================
--- branches/soc-2009-chingachgook/intern/ghost/GHOST_ISystem.h	2009-11-12 14:40:09 UTC (rev 24525)
+++ branches/soc-2009-chingachgook/intern/ghost/GHOST_ISystem.h	2009-11-12 14:49:54 UTC (rev 24526)
@@ -351,6 +351,11 @@
 	 */
 	virtual GHOST_TSuccess getButtonState(GHOST_TButtonMask mask, bool& isDown) const = 0;
 
+	
+	/***************************************************************************************
+	 ** Access to clipboard.
+	 ***************************************************************************************/
+	
 	/**
 	 * Returns the selection buffer
 	 * @return Returns "unsinged char" from X11 XA_CUT_BUFFER0 buffer
@@ -363,6 +368,22 @@
 	 */
 	virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const = 0;
 
+	
+	/***************************************************************************************
+	 ** Drag'n'drop operations
+	 ***************************************************************************************/
+	
+	/**
+	 * Tells if the ongoing drag'n'drop object can be accepted upon mouse drop
+	 */
+	virtual void setAcceptDragOperation(bool canAccept) = 0;
+	
+	/**
+	 * Returns acceptance of the dropped object
+	 * Usually called by the "object dropped" event handling function
+	 */
+	virtual bool canAcceptDragOperation() const = 0;
+	
 protected:
 	/**
 	 * Initialize the system.

Modified: branches/soc-2009-chingachgook/intern/ghost/GHOST_Types.h
===================================================================
--- branches/soc-2009-chingachgook/intern/ghost/GHOST_Types.h	2009-11-12 14:40:09 UTC (rev 24525)
+++ branches/soc-2009-chingachgook/intern/ghost/GHOST_Types.h	2009-11-12 14:49:54 UTC (rev 24526)
@@ -167,6 +167,12 @@
 	GHOST_kEventWindowUpdate,
 	GHOST_kEventWindowSize,
 	GHOST_kEventWindowMove,
+	
+	GHOST_kEventDraggingEntered,
+	GHOST_kEventDraggingUpdated,
+	GHOST_kEventDraggingExited,
+	GHOST_kEventDraggingDropDone,
+	GHOST_kEventDraggingDropOnIcon,
 
 	GHOST_kEventTimer,
 
@@ -368,6 +374,30 @@
 } GHOST_TEventWheelData;
 
 
+typedef enum {
+	GHOST_kDragnDropTypeUnknown =0,
+	GHOST_kDragnDropTypeFilenames, /*Array of strings representing file names (full path) */
+	GHOST_kDragnDropTypeString, /* Unformatted text UTF-8 string */
+	GHOST_kDragnDropTypeBitmap /*Bitmap image data */
+} GHOST_TDragnDropTypes;
+
+typedef struct {
+	/** The x-coordinate of the cursor position. */
+	GHOST_TInt32 x;
+	/** The y-coordinate of the cursor position. */
+	GHOST_TInt32 y;
+	/** The dropped item type */
+	GHOST_TDragnDropTypes dataType;
+	/** The "dropped content" */
+	GHOST_TEventDataPtr data;
+} GHOST_TEventDragnDropData;
+
+typedef struct {
+	int count;
+	GHOST_TUns8 **strings;
+} GHOST_TStringArray;
+
+
 /* original patch used floats, but the driver return ints and uns. We will calibrate in view, no sense on doing conversions twice */
 /* as all USB device controls are likely to use ints, this is also more future proof */
 //typedef struct {

Modified: branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_C-api.cpp
===================================================================
--- branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_C-api.cpp	2009-11-12 14:40:09 UTC (rev 24525)
+++ branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_C-api.cpp	2009-11-12 14:49:54 UTC (rev 24526)
@@ -404,7 +404,14 @@
 }
 
 
+void GHOST_setAcceptDragOperation(GHOST_SystemHandle systemhandle, GHOST_TInt8 canAccept)
+{
+	GHOST_ISystem* system = (GHOST_ISystem*) systemhandle;
 
+	system->setAcceptDragOperation(canAccept);
+}
+
+
 GHOST_TEventType GHOST_GetEventType(GHOST_EventHandle eventhandle)
 {
 	GHOST_IEvent* event = (GHOST_IEvent*) eventhandle;

Copied: branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_EventDragnDrop.h (from rev 24522, trunk/blender/intern/ghost/intern/GHOST_EventDragnDrop.h)
===================================================================
--- branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_EventDragnDrop.h	                        (rev 0)
+++ branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_EventDragnDrop.h	2009-11-12 14:49:54 UTC (rev 24526)
@@ -0,0 +1,91 @@
+/**
+ * $Id$
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list