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

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Mon May 3 01:10:26 CEST 2010


Revision: 28537
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28537
Author:   kjym3
Date:     2010-05-03 01:10:22 +0200 (Mon, 03 May 2010)

Log Message:
-----------
Merged changes in the trunk up to revision 28536.

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/config/aix4-config.py
    branches/soc-2008-mxcurioni/config/irix6-config.py
    branches/soc-2008-mxcurioni/config/linux2-config.py
    branches/soc-2008-mxcurioni/doc/blender-cmake.txt
    branches/soc-2008-mxcurioni/extern/libopenjpeg/opj_malloc.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.h
    branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_MeshPrimitives.cpp
    branches/soc-2008-mxcurioni/intern/bsp/intern/CSG_BooleanOps.cpp
    branches/soc-2008-mxcurioni/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
    branches/soc-2008-mxcurioni/intern/bsp/test/BSP_GhostTest/BSP_MeshDrawer.cpp
    branches/soc-2008-mxcurioni/intern/bsp/test/BSP_GhostTest/BSP_PlyLoader.cpp
    branches/soc-2008-mxcurioni/intern/bsp/test/BSP_GhostTest/main.cpp
    branches/soc-2008-mxcurioni/intern/bsp/test/BSP_GhostTest/plyfile.c
    branches/soc-2008-mxcurioni/intern/container/intern/CTR_List.cpp
    branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_EdgeCollapser.cpp
    branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_ExternNormalEditor.cpp
    branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_FaceNormalEditor.cpp
    branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_ManMesh2.cpp
    branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_MeshPrimitives.cpp
    branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_QSDecimator.cpp
    branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_QuadricEditor.cpp
    branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_decimation.cpp
    branches/soc-2008-mxcurioni/intern/decimation/intern/future/LOD_ExternVColorEditor.cpp
    branches/soc-2008-mxcurioni/intern/decimation/intern/future/LOD_NdQSDecimator.cpp
    branches/soc-2008-mxcurioni/intern/decimation/intern/future/LOD_NdQuadric.cpp
    branches/soc-2008-mxcurioni/intern/decimation/intern/future/LOD_NdQuadricEditor.cpp
    branches/soc-2008-mxcurioni/intern/decimation/test/decimate_glut_test/intern/LOD_GhostTestApp.cpp
    branches/soc-2008-mxcurioni/intern/decimation/test/decimate_glut_test/intern/common/GlutDrawer.cpp
    branches/soc-2008-mxcurioni/intern/decimation/test/decimate_glut_test/intern/common/GlutKeyboardManager.cpp
    branches/soc-2008-mxcurioni/intern/decimation/test/decimate_glut_test/intern/common/GlutMouseManager.cpp
    branches/soc-2008-mxcurioni/intern/decimation/test/decimate_glut_test/intern/main.cpp
    branches/soc-2008-mxcurioni/intern/decimation/test/decimate_glut_test/intern/ply/plyfile.c
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Buttons.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_CallbackEventConsumer.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManager.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerCarbon.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventManager.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_EventPrinter.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_ISystem.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_ModifierKeys.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Rect.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_TimerManager.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCarbon.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowManager.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/test/gears/GHOST_C-Test.c
    branches/soc-2008-mxcurioni/intern/ghost/test/gears/GHOST_Test.cpp
    branches/soc-2008-mxcurioni/intern/ghost/test/multitest/Basic.c
    branches/soc-2008-mxcurioni/intern/ghost/test/multitest/EventToBuf.c
    branches/soc-2008-mxcurioni/intern/ghost/test/multitest/MultiTest.c
    branches/soc-2008-mxcurioni/intern/ghost/test/multitest/ScrollBar.c
    branches/soc-2008-mxcurioni/intern/ghost/test/multitest/Util.c
    branches/soc-2008-mxcurioni/intern/ghost/test/multitest/WindowData.c
    branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h
    branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
    branches/soc-2008-mxcurioni/intern/guardedalloc/test/simpletest/memtest.c
    branches/soc-2008-mxcurioni/intern/iksolver/intern/IK_QSegment.cpp
    branches/soc-2008-mxcurioni/intern/iksolver/test/ik_glut_test/common/GlutDrawer.cpp
    branches/soc-2008-mxcurioni/intern/iksolver/test/ik_glut_test/common/GlutKeyboardManager.cpp
    branches/soc-2008-mxcurioni/intern/iksolver/test/ik_glut_test/common/GlutMouseManager.cpp
    branches/soc-2008-mxcurioni/intern/iksolver/test/ik_glut_test/intern/main.cpp
    branches/soc-2008-mxcurioni/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/soc-2008-mxcurioni/intern/memutil/intern/MEM_RefCountedC-Api.cpp
    branches/soc-2008-mxcurioni/intern/moto/intern/MT_CmMatrix4x4.cpp
    branches/soc-2008-mxcurioni/intern/moto/intern/MT_Matrix3x3.cpp
    branches/soc-2008-mxcurioni/intern/moto/intern/MT_Matrix4x4.cpp
    branches/soc-2008-mxcurioni/intern/moto/intern/MT_Plane3.cpp
    branches/soc-2008-mxcurioni/intern/moto/intern/MT_Point3.cpp
    branches/soc-2008-mxcurioni/intern/moto/intern/MT_Quaternion.cpp
    branches/soc-2008-mxcurioni/intern/moto/intern/MT_Transform.cpp
    branches/soc-2008-mxcurioni/intern/moto/intern/MT_Vector2.cpp
    branches/soc-2008-mxcurioni/intern/moto/intern/MT_Vector3.cpp
    branches/soc-2008-mxcurioni/intern/moto/intern/MT_Vector4.cpp
    branches/soc-2008-mxcurioni/intern/moto/intern/MT_random.cpp
    branches/soc-2008-mxcurioni/po/zh_CN.po
    branches/soc-2008-mxcurioni/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/soc-2008-mxcurioni/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj
    branches/soc-2008-mxcurioni/release/datafiles/blenderbuttons
    branches/soc-2008-mxcurioni/release/scripts/io/engine_render_pov.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_fbx.py
    branches/soc-2008-mxcurioni/release/scripts/io/import_anim_bvh.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/client.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/master.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/master_html.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/model.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/netrender.css
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/operators.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/slave.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/utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
    branches/soc-2008-mxcurioni/release/scripts/modules/console/complete_import.py
    branches/soc-2008-mxcurioni/release/scripts/modules/graphviz_export.py
    branches/soc-2008-mxcurioni/release/scripts/op/add_mesh_torus.py
    branches/soc-2008-mxcurioni/release/scripts/op/console_python.py
    branches/soc-2008-mxcurioni/release/scripts/op/object.py
    branches/soc-2008-mxcurioni/release/scripts/op/presets.py
    branches/soc-2008-mxcurioni/release/scripts/op/sequencer.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/interaction/maya.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_draw.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_simple.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_camera.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_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_material.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_physics_cloth.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.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_physics_softbody.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_outliner.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
    branches/soc-2008-mxcurioni/source/blender/avi/intern/avirgb.c
    branches/soc-2008-mxcurioni/source/blender/avi/intern/codecs.c
    branches/soc-2008-mxcurioni/source/blender/avi/intern/endian.c
    branches/soc-2008-mxcurioni/source/blender/avi/intern/mjpeg.c
    branches/soc-2008-mxcurioni/source/blender/avi/intern/options.c
    branches/soc-2008-mxcurioni/source/blender/avi/intern/rgb32.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_api.h
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/Makefile
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_anim.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_armature.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_constraint.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_context.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_screen.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sound.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bmfont.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/cdderivedmesh.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/deform.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/fcurve.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/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/image_gen.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/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/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/property.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/report.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sca.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/screen.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.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/sound.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/world.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeframeserver.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_fnmatch.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_path_util.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_threads.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_linklist.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_memarena.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/dynlib.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fnmatch.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/graph.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/gsqueue.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.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/rand.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/rct.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/scanfill.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/threads.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/time.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/undofile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_draw.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/poseobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/B.blend.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/Bfont.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/blenderbuttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_armature.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_gpencil.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_physics.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_icons.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.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_regions.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_style.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.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_ops.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_constraint.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_hook.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
    branches/soc-2008-mxcurioni/source/blender/editors/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/sculpt_paint/paint_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.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_console/console_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filelist.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/filesel.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/space_file.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/writeimage.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_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_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_intern.h
    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_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawanimviz.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/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_header.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_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_generics.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.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/editmode_undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2008-mxcurioni/source/blender/gpu/GPU_draw.h
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/md5.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_curve_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_documentation.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_sequence_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_gpencil.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_lattice.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_property.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/MOD_modifiertypes.h
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cast.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smooth.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.h
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_material.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.h
    branches/soc-2008-mxcurioni/source/blender/python/generic/blf_api.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils.h
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_color.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_euler.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/intern/bpy.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_driver.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/quicktime/quicktime_import.h
    branches/soc-2008-mxcurioni/source/blender/readblenfile/intern/BLO_readblenfile.c
    branches/soc-2008-mxcurioni/source/blender/readblenfile/test/test.c
    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/gammaCorrectionTables.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pointdensity.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.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/verify/intern/BLO_verify.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_event_types.h
    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/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderSystem.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureConstraint.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_DeformableGameObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BlenderWorldInfo.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertProperties.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/BoolValue.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/ConstExpr.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/EXP_C-Api.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/EmptyValue.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/ErrorValue.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/Expression.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/FloatValue.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/IdentifierExpr.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/IfExpr.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/InputParser.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/IntValue.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/KX_HashedPtr.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/ListValue.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/Operator1Expr.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/Operator2Expr.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/StringValue.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/Value.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/VectorValue.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ANDController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_BasicEventManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_EventManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ExpressionController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IInputDevice.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IScene.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_JoystickManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_LogicManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_MouseManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_MouseManager.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_NANDController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_NORController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ORController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertyEventManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonMouse.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_XNORController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_XORController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ActiveX/BlenderDataPathProperty.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ActiveX/BlenderPlayer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ActiveX/BlenderPlayerPpg.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ActiveX/CControlRefresher.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ActiveX/MemoryResource.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ActiveX/RawImageRsrc.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ActiveX/SafeControl.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ActiveX/StdAfx.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_Engine.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_System.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/bmfont.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/unix/GPU_Canvas.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/unix/GPU_Engine.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/unix/GPU_Engine.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/unix/GPU_KeyboardDevice.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/unix/GPU_System.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/windows/GPW_Canvas.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/windows/GPW_Engine.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/windows/GPW_System.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_System.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/common/npmac.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/common/npunix.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/common/npwin.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/src/Blender3DPlugin_native_implementation.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/src/PLG_MSWindows_windowing.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/src/PLG_X11_windowing.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/src/UnixShell.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_MSWindows_event_sinks.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_MSWindows_services.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_unix_event_sinks.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_unix_services.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/src/netscape_plugin_Plugin.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/src/stubs.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/src/winstubs.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/src/xpcom/XPH_xpcom_hooks.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/src/xpcom/_Blender3DPlugin_implementation_.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/test/colorcycle/TST_colorcycle.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/test/gears/TST_gears.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/test/stub/TST_stubbed_app.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/test/threaded_gears/TST_threaded_gears.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/UnixShell.c
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/npunix.c
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkObjectActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkObjectSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ArmatureSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CameraIpoSGController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_EmptyObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IPO_SGController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IPhysicsController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Light.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_LightIpoSGController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MotionState.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_NearSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObColorIpoSGController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PositionInterpolator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyMath.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RayCast.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RayEventManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ScalarInterpolator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ScalingInterpolator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_StateActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TimeCategoryLogger.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TimeLogger.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_WorldInfo.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_WorldIpoController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Network/LoopBackNetwork/NG_LoopBackNetworkDeviceInterface.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Network/NG_NetworkMessage.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Network/NG_NetworkObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Network/NG_NetworkScene.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Network/TerraplayNetwork/NG_TerraplayNetworkDeviceInterface.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IGraphicController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IMotionState.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IPhysicsController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.cpp
    branches/soc-2008-mxcurioni/source/gameengine/PyDoc/GameKeys.py
    branches/soc-2008-mxcurioni/source/gameengine/PyDoc/GameLogic.py
    branches/soc-2008-mxcurioni/source/gameengine/PyDoc/GameTypes.py
    branches/soc-2008-mxcurioni/source/gameengine/PyDoc/PhysicsConstraints.py
    branches/soc-2008-mxcurioni/source/gameengine/PyDoc/VideoTexture.py
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_FramingManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_ICanvas.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_texmatrix.cpp
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_Controller.cpp
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_IObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_Node.cpp
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_Spatial.cpp
    branches/soc-2008-mxcurioni/source/kernel/gen_messaging/intern/messaging.c
    branches/soc-2008-mxcurioni/source/kernel/gen_system/GEN_HashedPtr.cpp
    branches/soc-2008-mxcurioni/source/kernel/gen_system/GEN_Matrix4x4.cpp
    branches/soc-2008-mxcurioni/source/kernel/gen_system/SYS_SingletonSystem.cpp
    branches/soc-2008-mxcurioni/source/kernel/gen_system/SYS_System.cpp
    branches/soc-2008-mxcurioni/source/nan_compile.mk
    branches/soc-2008-mxcurioni/source/nan_definitions.mk
    branches/soc-2008-mxcurioni/source/nan_link.mk

Added Paths:
-----------
    branches/soc-2008-mxcurioni/extern/libopenjpeg/patches/fbsd.patch
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/repath.py
    branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_types.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_logic.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_ops.c

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2010-05-02 21:34:08 UTC (rev 28536)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2010-05-02 23:10:22 UTC (rev 28537)
@@ -102,9 +102,9 @@
 
 # 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
+#   cmake -D PYTHON_LIB=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INC=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
 # On Macs: 
-#   cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/config -D PYTHON_BINARY=/System/Library/Frameworks/Python.framework/Versions/2.5/bin/python2.5 -G Xcode ../blender
+#   cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/3.1/lib/python3.1/config -G Xcode ../blender
 #
 # When changing any of this remember to update the notes in doc/blender-cmake.txt
 
@@ -479,7 +479,7 @@
 		# otherwise, use custom system framework
 
 		SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
-		SET(PYTHON_VERSION 2.5)
+		SET(PYTHON_VERSION 3.1)
 		SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}")
 		# SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet
 		SET(PYTHON_LIB "")

Modified: branches/soc-2008-mxcurioni/config/aix4-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/aix4-config.py	2010-05-02 21:34:08 UTC (rev 28536)
+++ branches/soc-2008-mxcurioni/config/aix4-config.py	2010-05-02 23:10:22 UTC (rev 28537)
@@ -14,7 +14,7 @@
 BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
 BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
 BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python2.5/config/libpython${BF_PYTHON_VERSION}.a'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config/libpython${BF_PYTHON_VERSION}.a'
 
 WITH_BF_OPENAL = 'false'
 WITH_BF_STATICOPENAL = 'false'

Modified: branches/soc-2008-mxcurioni/config/irix6-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/irix6-config.py	2010-05-02 21:34:08 UTC (rev 28536)
+++ branches/soc-2008-mxcurioni/config/irix6-config.py	2010-05-02 23:10:22 UTC (rev 28537)
@@ -10,7 +10,7 @@
 BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
 BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}' #BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a'
 BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic']
-BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python2.5/config/libpython${BF_PYTHON_VERSION}.a'
+BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config/libpython${BF_PYTHON_VERSION}.a'
 
 WITH_BF_OPENAL = 'true'
 WITH_BF_STATICOPENAL = 'true'

Modified: branches/soc-2008-mxcurioni/config/linux2-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/linux2-config.py	2010-05-02 21:34:08 UTC (rev 28536)
+++ branches/soc-2008-mxcurioni/config/linux2-config.py	2010-05-02 23:10:22 UTC (rev 28537)
@@ -175,10 +175,10 @@
 ##ifeq ($CPU),alpha)
 ##   CFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing -mieee
 
-CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']
 
 CPPFLAGS = []
-CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+CXXFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing','-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64']
 REL_CFLAGS = ['-O2']
 REL_CCFLAGS = ['-O2']
 ##BF_DEPEND = True

Modified: branches/soc-2008-mxcurioni/doc/blender-cmake.txt
===================================================================
--- branches/soc-2008-mxcurioni/doc/blender-cmake.txt	2010-05-02 21:34:08 UTC (rev 28536)
+++ branches/soc-2008-mxcurioni/doc/blender-cmake.txt	2010-05-02 23:10:22 UTC (rev 28537)
@@ -132,9 +132,9 @@
     The commandline can be used to override detected/default 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
+      cmake -D PYTHON_LIB=/usr/local/lib/python3.1/config/libpython3.1.so -D PYTHON_INC=/usr/local/include/python3.1 -G "Unix Makefiles" ../blender
     On Macs: 
-      cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5 -D PYTHON_LIBPATH=/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/config -D PYTHON_BINARY=/System/Library/Frameworks/Python.framework/Versions/2.5/bin/python2.5 -G Xcode ../blender
+      cmake -D PYTHON_INC=/System/Library/Frameworks/Python.framework/Versions/3.1/include/python3.1 -G Xcode ../blender
 
     Mote that this should only be needed once per build directory generation because it will keep the overrides in CMakeCache.txt for subsequent runs.
 

Modified: branches/soc-2008-mxcurioni/extern/libopenjpeg/opj_malloc.h
===================================================================
--- branches/soc-2008-mxcurioni/extern/libopenjpeg/opj_malloc.h	2010-05-02 21:34:08 UTC (rev 28536)
+++ branches/soc-2008-mxcurioni/extern/libopenjpeg/opj_malloc.h	2010-05-02 23:10:22 UTC (rev 28537)
@@ -76,7 +76,7 @@
 	#if defined(__sun)
 			#define HAVE_MEMALIGN
 		#elif defined(__GNUC__)
-                        #ifndef __APPLE__
+                        #if !defined(__APPLE__) && !defined(__FreeBSD__)
 			    #define HAVE_MEMALIGN
 			    #include <malloc.h>
                         #endif

Copied: branches/soc-2008-mxcurioni/extern/libopenjpeg/patches/fbsd.patch (from rev 28536, trunk/blender/extern/libopenjpeg/patches/fbsd.patch)
===================================================================
--- branches/soc-2008-mxcurioni/extern/libopenjpeg/patches/fbsd.patch	                        (rev 0)
+++ branches/soc-2008-mxcurioni/extern/libopenjpeg/patches/fbsd.patch	2010-05-02 23:10:22 UTC (rev 28537)
@@ -0,0 +1,13 @@
+Index: extern/libopenjpeg/opj_malloc.h
+===================================================================
+--- extern/libopenjpeg/opj_malloc.h	(revision 27736)
++++ extern/libopenjpeg/opj_malloc.h	(working copy)
+@@ -76,7 +76,7 @@
+ 	#if defined(__sun)
+ 			#define HAVE_MEMALIGN
+ 		#elif defined(__GNUC__)
+-                        #ifndef __APPLE__
++                        #if !defined(__APPLE__) && !defined(__FreeBSD__)
+ 			    #define HAVE_MEMALIGN
+ 			    #include <malloc.h>
+                         #endif

Modified: branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.cpp	2010-05-02 21:34:08 UTC (rev 28536)
+++ branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.cpp	2010-05-02 23:10:22 UTC (rev 28537)
@@ -84,11 +84,15 @@
 static int AUD_available_devices[4];
 static AUD_I3DDevice* AUD_3ddevice = NULL;
 
-int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize)
+void AUD_initOnce()
 {
 #ifdef WITH_FFMPEG
 	av_register_all();
 #endif
+}
+
+int AUD_init(AUD_DeviceType device, AUD_DeviceSpecs specs, int buffersize)
+{
 	AUD_IDevice* dev = NULL;
 
 	if(AUD_device)

Modified: branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.h	2010-05-02 21:34:08 UTC (rev 28536)
+++ branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.h	2010-05-02 23:10:22 UTC (rev 28537)
@@ -56,6 +56,11 @@
 #endif
 
 /**
+ * Initializes FFMPEG if it is enabled.
+ */
+extern void AUD_initOnce();
+
+/**
  * Initializes an audio device.
  * \param device The device type that should be used.
  * \param specs The audio specification to be used.

Modified: branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_MeshPrimitives.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_MeshPrimitives.cpp	2010-05-02 21:34:08 UTC (rev 28536)
+++ branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_MeshPrimitives.cpp	2010-05-02 23:10:22 UTC (rev 28537)
@@ -26,10 +26,6 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "BSP_MeshPrimitives.h"
 
 #include "MT_assert.h"

Modified: branches/soc-2008-mxcurioni/intern/bsp/intern/CSG_BooleanOps.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/bsp/intern/CSG_BooleanOps.cpp	2010-05-02 21:34:08 UTC (rev 28536)
+++ branches/soc-2008-mxcurioni/intern/bsp/intern/CSG_BooleanOps.cpp	2010-05-02 23:10:22 UTC (rev 28537)
@@ -30,10 +30,6 @@
  * Implementation of external api for CSG part of BSP lib interface.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "../extern/CSG_BooleanOps.h"
 #include "BSP_CSGMesh_CFIterator.h"
 #include "MEM_RefCountPtr.h"

Modified: branches/soc-2008-mxcurioni/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp
===================================================================
--- branches/soc-2008-mxcurioni/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp	2010-05-02 21:34:08 UTC (rev 28536)
+++ branches/soc-2008-mxcurioni/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp	2010-05-02 23:10:22 UTC (rev 28537)
@@ -31,10 +31,6 @@
 * $Id$
 * Copyright (C) 2001 NaN Technologies B.V.
 */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #if defined(WIN32) || defined(__APPLE__)
 #	ifdef WIN32
 #		include <windows.h>


@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list