[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34196] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 34193.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sun Jan 9 16:07:26 CET 2011


Revision: 34196
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34196
Author:   kjym3
Date:     2011-01-09 15:07:14 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
Merged changes in the trunk up to revision 34193.

Conflicts resolved:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_channels.c
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c

API changes resolved:
source/blender/freestyle/intern/system/PythonInterpreter.h

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=34193

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
    branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_Path-api.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_Types.h
    branches/soc-2008-mxcurioni/intern/ghost/SConscript
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Path-api.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCarbon.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/Makefile
    branches/soc-2008-mxcurioni/release/VERSION
    branches/soc-2008-mxcurioni/release/freedesktop/icons/16x16/blender.png
    branches/soc-2008-mxcurioni/release/freedesktop/icons/22x22/blender.png
    branches/soc-2008-mxcurioni/release/freedesktop/icons/32x32/blender.png
    branches/soc-2008-mxcurioni/release/freedesktop/icons/32x32/blender.svg
    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/operators.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/path.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_anim_bvh/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_anim_bvh/export_bvh.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_anim_bvh/import_bvh.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_mesh_ply/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_fbx/export_fbx.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_x3d/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_x3d/export_x3d.py
    branches/soc-2008-mxcurioni/release/scripts/op/mesh.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_mesh.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_dopesheet.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_graph.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_nla.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.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/release/text/readme.html
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_font.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_brush.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_exotic.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_key.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_multires.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_pointcache.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_utildefines.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/BME_conversions.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/BME_eulers.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/BME_structure.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/BME_tools.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
    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/anim_sys.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/boids.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bvhutils.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.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/curve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata_file.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/exotic.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fluidsim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/gpencil.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/icons.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/implicit.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/key.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.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/mball.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/nla.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/packedFile.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/paint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/report.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.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/sketch.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.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/writeavi.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeframeserver.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_ghash.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_args.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.c
    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/freetypefont.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/graph.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/noise.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/pbvh.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/voxel.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/winstuff.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readblenentry.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/collada/DocumentImporter.cpp
    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_filter.c
    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/fmodifier_ui.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/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_generate.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_retarget.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poseSlide.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poseUtils.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/armature/reeb.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/gpencil/drawgpencil.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/editaction_gpencil.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_gpencil.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_mesh.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_transform.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.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_layout.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
    branches/soc-2008-mxcurioni/source/blender/editors/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_lib.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loop.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/loopcut.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
    branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_bake.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_group.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_shapekey.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_boids.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_object.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.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/glutil.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_context.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_image.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_stroke.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.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_header.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/console_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.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/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_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_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_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_header.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_render.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_report.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_stats.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/space_info.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/textview.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_ops.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/nla_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_channels.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/space_nla.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_buttons.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_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_state.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_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_script/script_header.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/sequencer_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_scopes.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sound/sound_header.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_header.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_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/drawvolume.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_fly.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
    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_snap.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_toolbar.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_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_input.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ndofinput.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_orientations.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/util/editmode_undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/numinput.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/system/PythonInterpreter.h
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
    branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/ikplugin_api.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/imbuf/intern/anim_movie.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cache.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/divers.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/filter.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/rectop.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/rotate.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs_blend.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/tiff.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_brush_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_lattice_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_force.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.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_image_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_key.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lattice.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.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_meta.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_pose.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.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/modifiers/intern/MOD_armature.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_bevel.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_build.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cast.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cloth.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_collision.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_curve.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_decimate.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_hook.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_lattice.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mask.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mirror.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_none.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particlesystem.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shapekey.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shrinkwrap.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smoke.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smooth.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_softbody.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_subsurf.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_surface.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_uvproject.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_util.h
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_util.h
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_util.h
    branches/soc-2008-mxcurioni/source/blender/python/BPY_extern.h
    branches/soc-2008-mxcurioni/source/blender/python/generic/IDProp.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/blf_py_api.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_color.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_euler.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_geometry.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_matrix.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_quat.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_vector.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/noise.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_driver.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_operator_wrap.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_callback.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/stubs.c
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_raytrace.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/bvh.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/reorganize.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/svbvh.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/vbvh.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/envmap.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/imagetexture.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/initrender.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/pixelshading.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pointdensity.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayobject_blibvh.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayobject_instance.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayobject_octree.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/renderdatabase.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadbuf.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeinput.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/sss.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/strand.c
    branches/soc-2008-mxcurioni/source/blender/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/voxeldata.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_draw.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_gesture.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_jobs.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_subwindow.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/creator/buildinfo.c
    branches/soc-2008-mxcurioni/source/creator/creator.c
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_FontObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_FontObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IpoActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

Added Paths:
-----------
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystemPaths.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_ISystemPaths.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPaths.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsCarbon.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsCarbon.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsCocoa.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsCocoa.mm
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsWin32.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsX11.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsX11.h
    branches/soc-2008-mxcurioni/release/freedesktop/icons/128x128/
    branches/soc-2008-mxcurioni/release/freedesktop/icons/128x128/blender.png
    branches/soc-2008-mxcurioni/release/freedesktop/icons/128x128/blender.svg
    branches/soc-2008-mxcurioni/release/freedesktop/icons/16x16/blender.svg
    branches/soc-2008-mxcurioni/release/freedesktop/icons/192x192/
    branches/soc-2008-mxcurioni/release/freedesktop/icons/192x192/blender.png
    branches/soc-2008-mxcurioni/release/freedesktop/icons/192x192/blender.svg
    branches/soc-2008-mxcurioni/release/freedesktop/icons/22x22/blender.svg
    branches/soc-2008-mxcurioni/release/freedesktop/icons/48x48/
    branches/soc-2008-mxcurioni/release/freedesktop/icons/48x48/blender.png
    branches/soc-2008-mxcurioni/release/freedesktop/icons/48x48/blender.svg
    branches/soc-2008-mxcurioni/release/freedesktop/icons/64x64/
    branches/soc-2008-mxcurioni/release/freedesktop/icons/64x64/blender.png
    branches/soc-2008-mxcurioni/release/freedesktop/icons/64x64/blender.svg
    branches/soc-2008-mxcurioni/release/freedesktop/icons/96x96/
    branches/soc-2008-mxcurioni/release/freedesktop/icons/96x96/blender.png
    branches/soc-2008-mxcurioni/release/freedesktop/icons/96x96/blender.svg
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_array_mallocn.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_utildefines.h

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/release/freedesktop/icons/128x128/blender.png
    branches/soc-2008-mxcurioni/release/freedesktop/icons/128x128/blender.svg
    branches/soc-2008-mxcurioni/release/freedesktop/icons/16x16/blender.xcf.bz2
    branches/soc-2008-mxcurioni/release/freedesktop/icons/192x192/blender.png
    branches/soc-2008-mxcurioni/release/freedesktop/icons/192x192/blender.svg
    branches/soc-2008-mxcurioni/release/freedesktop/icons/22x22/blender.xcf.bz2
    branches/soc-2008-mxcurioni/release/freedesktop/icons/48x48/blender.png
    branches/soc-2008-mxcurioni/release/freedesktop/icons/48x48/blender.svg
    branches/soc-2008-mxcurioni/release/freedesktop/icons/64x64/blender.png
    branches/soc-2008-mxcurioni/release/freedesktop/icons/64x64/blender.svg
    branches/soc-2008-mxcurioni/release/freedesktop/icons/96x96/blender.png
    branches/soc-2008-mxcurioni/release/freedesktop/icons/96x96/blender.svg
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_retopo.h

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    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/op/add_mesh_torus.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_anim_bvh/import_bvh.py
    branches/soc-2008-mxcurioni/release/scripts/op/io_scene_obj/import_obj.py
    branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_smart_project.py
    branches/soc-2008-mxcurioni/release/scripts/op/vertexpaint_dirt.py
    branches/soc-2008-mxcurioni/release/scripts/presets/sss/chicken.py
    branches/soc-2008-mxcurioni/release/scripts/presets/sss/cream.py
    branches/soc-2008-mxcurioni/release/scripts/presets/sss/ketchup.py
    branches/soc-2008-mxcurioni/release/scripts/presets/sss/marble.py
    branches/soc-2008-mxcurioni/release/scripts/presets/sss/potato.py
    branches/soc-2008-mxcurioni/release/scripts/presets/sss/skim_milk.py
    branches/soc-2008-mxcurioni/release/scripts/presets/sss/skin1.py
    branches/soc-2008-mxcurioni/release/scripts/presets/sss/skin2.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_bone.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_camera.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_empty.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lamp.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lattice.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_mesh.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_metaball.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_game.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_material.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_field.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_fluid.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_smoke.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_node.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata_file.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata_file.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/startup.blend.c
    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_transform.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
    branches/soc-2008-mxcurioni/source/blender/editors/metaball/mball_edit.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_group.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_hook.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_lattice.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_shapekey.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_boids.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_intern.h
    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/sculpt_paint/
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_state.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_userpref/
    branches/soc-2008-mxcurioni/source/blender/editors/space_userpref/space_userpref.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_userpref/userpref_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_userpref/userpref_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2008-mxcurioni/source/blender/gpu/GPU_buffers.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_outliner_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sculpt_paint.c


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/blender:34011-34193

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2011-01-09 14:53:18 UTC (rev 34195)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2011-01-09 15:07:14 UTC (rev 34196)
@@ -885,18 +885,18 @@
 if(WITH_BUILDINFO)
 	# BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake
 	if(UNIX)
-		EXEC_PROGRAM("date \"+%Y-%m-%d\"" OUTPUT_VARIABLE BUILD_DATE)
-		EXEC_PROGRAM("date \"+%H:%M:%S\"" OUTPUT_VARIABLE BUILD_TIME)  
-		EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV RETURN_VALUE BUILD_REV_RETURN)
+		execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+		execute_process(COMMAND date "+%H:%M:%S" OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)  
+		execute_process(COMMAND svnversion ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BUILD_REV RESULT_VARIABLE BUILD_REV_RETURN OUTPUT_STRIP_TRAILING_WHITESPACE)
 		if(BUILD_REV_RETURN)
 			set(BUILD_REV "unknown")
 		endif()
 	endif()
 	
 	if(WIN32)
-		EXEC_PROGRAM("cmd /c date /t" OUTPUT_VARIABLE BUILD_DATE)
-		EXEC_PROGRAM("cmd /c time /t" OUTPUT_VARIABLE BUILD_TIME)  
-		EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV RETURN_VALUE BUILD_REV_RETURN)
+		execute_process(COMMAND cmd /c date /t OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+		execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)  
+		execute_process(COMMAND svnversion ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE BUILD_REV RESULT_VARIABLE BUILD_REV_RETURN OUTPUT_STRIP_TRAILING_WHITESPACE)
 		if(BUILD_REV_RETURN)
 			set(BUILD_REV "unknown")
 		endif()

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py	2011-01-09 14:53:18 UTC (rev 34195)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py	2011-01-09 15:07:14 UTC (rev 34196)
@@ -22,6 +22,12 @@
 BF_OPENAL_LIB = 'wrap_oal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
+WITH_BF_SNDFILE = True
+BF_SNDFILE = LIBDIR + '/sndfile'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'libsndfile-1'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
 # TODO - are these useful on win32?
 # BF_CXX = '/usr'
 # WITH_BF_STATICCXX = False

Modified: branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt	2011-01-09 14:53:18 UTC (rev 34195)
+++ branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt	2011-01-09 15:07:14 UTC (rev 34196)
@@ -36,10 +36,12 @@
 	intern/GHOST_Buttons.cpp
 	intern/GHOST_CallbackEventConsumer.cpp
 	intern/GHOST_C-api.cpp
+	intern/GHOST_Path-api.cpp
 	intern/GHOST_DisplayManager.cpp
 	intern/GHOST_EventManager.cpp
 	intern/GHOST_EventPrinter.cpp
 	intern/GHOST_ISystem.cpp
+	intern/GHOST_ISystemPaths.cpp
 	intern/GHOST_ModifierKeys.cpp
 	intern/GHOST_NDOFManager.cpp
 	intern/GHOST_Path-api.cpp
@@ -87,20 +89,24 @@
 		list(APPEND SRC
 			intern/GHOST_DisplayManagerCocoa.mm
 			intern/GHOST_SystemCocoa.mm
+			intern/GHOST_SystemPathsCocoa.mm
 			intern/GHOST_WindowCocoa.mm
 			
 			intern/GHOST_DisplayManagerCocoa.h
 			intern/GHOST_SystemCocoa.h
+			intern/GHOST_SystemPathsCocoa.h
 			intern/GHOST_WindowCocoa.h
 		)
 	else()
 		list(APPEND SRC
 			intern/GHOST_DisplayManagerCarbon.cpp
 			intern/GHOST_SystemCarbon.cpp
+			intern/GHOST_SystemPathsCarbon.cpp
 			intern/GHOST_WindowCarbon.cpp
 
 			intern/GHOST_DisplayManagerCarbon.h
 			intern/GHOST_SystemCarbon.h
+			intern/GHOST_SystemPathsCarbon.h
 			intern/GHOST_WindowCarbon.h
 		)
 	endif()
@@ -115,10 +121,12 @@
 	list(APPEND SRC
 		intern/GHOST_DisplayManagerX11.cpp
 		intern/GHOST_SystemX11.cpp
+		intern/GHOST_SystemPathsX11.cpp
 		intern/GHOST_WindowX11.cpp
 
 		intern/GHOST_DisplayManagerX11.h
 		intern/GHOST_SystemX11.h
+		intern/GHOST_SystemPathsX11.h
 		intern/GHOST_WindowX11.h
 	)
 
@@ -134,12 +142,14 @@
 	list(APPEND SRC
 		intern/GHOST_DisplayManagerWin32.cpp
 		intern/GHOST_SystemWin32.cpp
+		intern/GHOST_SystemPathsWin32.cpp
 		intern/GHOST_WindowWin32.cpp
 		intern/GHOST_DropTargetWin32.cpp
 
 		intern/GHOST_DisplayManagerWin32.h
 		intern/GHOST_DropTargetWin32.h
 		intern/GHOST_SystemWin32.h
+		intern/GHOST_SystemPathsWin32.h
 		intern/GHOST_WindowWin32.h
 	)
 endif()

Modified: branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h	2011-01-09 14:53:18 UTC (rev 34195)
+++ branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h	2011-01-09 15:07:14 UTC (rev 34196)
@@ -46,7 +46,6 @@
  * In the API the pointer is casted to the actual C++ class.
  * @param	name	Name of the handle to create.
  */
-#define GHOST_DECLARE_HANDLE(name) typedef struct name##__ { int unused; } *name
 
 GHOST_DECLARE_HANDLE(GHOST_SystemHandle);
 GHOST_DECLARE_HANDLE(GHOST_TimerTaskHandle);

Modified: branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h	2011-01-09 14:53:18 UTC (rev 34195)
+++ branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystem.h	2011-01-09 15:07:14 UTC (rev 34196)
@@ -370,25 +370,7 @@
 	 */
 	virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const = 0;
 
-		  	/**
-	 * Determine the base dir in which shared resources are located. It will first try to use
-	 * "unpack and run" path, then look for properly installed path, not including versioning.
-	 * @return Unsigned char string pointing to system dir (eg /usr/share/blender/).
-	 */
-	virtual const GHOST_TUns8* getSystemDir() const = 0;
-
-	/**
-	 * Determine the base dir in which user configuration is stored, not including versioning.
-	 * If needed, it will create the base directory.
-	 * @return Unsigned char string pointing to user dir (eg ~/.blender/).
-	 */
-	virtual const GHOST_TUns8* getUserDir() const = 0;
-
-	/**
-	  * Determine the directory of the current binary
-	  * @return Unsigned char string pointing to the binary dir
-	  */
-	 virtual const GHOST_TUns8* getBinaryDir() const = 0;
+	
 protected:
 	/**
 	 * Initialize the system.

Copied: branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystemPaths.h (from rev 34193, trunk/blender/intern/ghost/GHOST_ISystemPaths.h)
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystemPaths.h	                        (rev 0)
+++ branches/soc-2008-mxcurioni/intern/ghost/GHOST_ISystemPaths.h	2011-01-09 15:07:14 UTC (rev 34196)
@@ -0,0 +1,98 @@
+/**
+ * $Id$
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2009 Blender Foundation.
+ * All rights reserved.
+ *
+ * 
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+#ifndef _GHOST_ISYSTEMPATHS_H_
+#define _GHOST_ISYSTEMPATHS_H_
+
+#include "GHOST_Types.h"
+
+class GHOST_ISystemPaths
+{
+public:
+	/**
+	 * Creates the one and only system.
+	 * @return An indication of success.
+	 */
+	static GHOST_TSuccess create();
+
+	/**
+	 * Disposes the one and only system.
+	 * @return An indication of success.
+	 */
+	static GHOST_TSuccess dispose();
+
+	/**
+	 * Returns a pointer to the one and only system (nil if it hasn't been created).
+	 * @return A pointer to the system.
+	 */
+	static GHOST_ISystemPaths* get();
+
+protected:
+	/**
+	 * Constructor.
+	 * Protected default constructor to force use of static createSystem member.
+	 */
+	GHOST_ISystemPaths() {}
+
+	/**
+	 * Destructor.
+	 * Protected default constructor to force use of static dispose member.
+	 */
+	virtual ~GHOST_ISystemPaths() {}
+
+public:
+	/**
+	 * Determine the base dir in which shared resources are located. It will first try to use
+	 * "unpack and run" path, then look for properly installed path, not including versioning.
+	 * @return Unsigned char string pointing to system dir (eg /usr/share/blender/).
+	 */
+	virtual const GHOST_TUns8* getSystemDir() const = 0;
+
+	/**
+	 * Determine the base dir in which user configuration is stored, not including versioning.
+	 * If needed, it will create the base directory.
+	 * @return Unsigned char string pointing to user dir (eg ~/.blender/).
+	 */
+	virtual const GHOST_TUns8* getUserDir() const = 0;
+
+	/**
+	  * Determine the directory of the current binary
+	  * @return Unsigned char string pointing to the binary dir
+	  */
+	 virtual const GHOST_TUns8* getBinaryDir() const = 0;
+
+	 /**
+	  * Add the file to the operating system most recently used files
+	  */
+	 virtual void addToSystemRecentFiles(const char* filename) const = 0;
+
+private:
+	/** The one and only system paths*/
+	static GHOST_ISystemPaths* m_systemPaths;
+};
+
+#endif

Modified: branches/soc-2008-mxcurioni/intern/ghost/GHOST_Path-api.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/ghost/GHOST_Path-api.h	2011-01-09 14:53:18 UTC (rev 34195)
+++ branches/soc-2008-mxcurioni/intern/ghost/GHOST_Path-api.h	2011-01-09 15:07:14 UTC (rev 34196)
@@ -36,7 +36,21 @@
 extern "C" { 
 #endif
 
+GHOST_DECLARE_HANDLE(GHOST_SystemPathsHandle);
+
 /**
+ * Creates the one and only instance of the system path access.
+ * @return An indication of success.
+ */

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list