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

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sun Apr 29 02:59:08 CEST 2012


Revision: 46058
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46058
Author:   kjym3
Date:     2012-04-29 00:59:04 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 46045.

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46045

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/SConstruct
    branches/soc-2008-mxcurioni/build_files/buildbot/master.cfg
    branches/soc-2008-mxcurioni/build_files/buildbot/master_unpack.py
    branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py
    branches/soc-2008-mxcurioni/build_files/buildbot/slave_pack.py
    branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
    branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
    branches/soc-2008-mxcurioni/doc/manpage/blender.1
    branches/soc-2008-mxcurioni/doc/python_api/rst/include__bmesh.rst
    branches/soc-2008-mxcurioni/doc/python_api/rst/info_gotcha.rst
    branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/BroadphaseCollision/btQuantizedBvh.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodyConcaveCollisionAlgorithm.h
    branches/soc-2008-mxcurioni/extern/bullet2/src/SConscript
    branches/soc-2008-mxcurioni/extern/carve/SConscript
    branches/soc-2008-mxcurioni/extern/carve/bundle.sh
    branches/soc-2008-mxcurioni/extern/eltopo/SConscript
    branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt
    branches/soc-2008-mxcurioni/extern/libmv/ChangeLog
    branches/soc-2008-mxcurioni/extern/libmv/SConscript
    branches/soc-2008-mxcurioni/extern/libmv/bundle.sh
    branches/soc-2008-mxcurioni/extern/libmv/files.txt
    branches/soc-2008-mxcurioni/extern/libmv/libmv/numeric/numeric.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv-capi.cpp
    branches/soc-2008-mxcurioni/extern/libmv/libmv-capi.h
    branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/src/windows/port.cc
    branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/src/windows/port.h
    branches/soc-2008-mxcurioni/intern/SConscript
    branches/soc-2008-mxcurioni/intern/audaspace/SConscript
    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/audaspace/intern/AUD_FileWriter.cpp
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_FileWriter.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_Reference.h
    branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ReferenceHandler.cpp
    branches/soc-2008-mxcurioni/intern/boolop/SConscript
    branches/soc-2008-mxcurioni/intern/container/CTR_Map.h
    branches/soc-2008-mxcurioni/intern/cycles/SConscript
    branches/soc-2008-mxcurioni/intern/cycles/blender/addon/properties.py
    branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.h
    branches/soc-2008-mxcurioni/intern/cycles/bvh/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh.cpp
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_build.cpp
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_build.h
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_node.cpp
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_node.h
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_params.h
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_sort.cpp
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_sort.h
    branches/soc-2008-mxcurioni/intern/cycles/device/device.cpp
    branches/soc-2008-mxcurioni/intern/cycles/device/device.h
    branches/soc-2008-mxcurioni/intern/cycles/device/device_cpu.cpp
    branches/soc-2008-mxcurioni/intern/cycles/device/device_multi.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_accumulate.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_path.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_tex_coord.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2008-mxcurioni/intern/cycles/render/integrator.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/integrator.h
    branches/soc-2008-mxcurioni/intern/cycles/render/mesh.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/object.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/session.cpp
    branches/soc-2008-mxcurioni/intern/cycles/subd/subd_patch.cpp
    branches/soc-2008-mxcurioni/intern/cycles/util/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/cycles/util/util_boundbox.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_math.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_thread.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.cpp
    branches/soc-2008-mxcurioni/intern/cycles/util/util_types.h
    branches/soc-2008-mxcurioni/intern/elbeem/intern/ntl_geometrymodel.cpp
    branches/soc-2008-mxcurioni/intern/elbeem/intern/ntl_world.cpp
    branches/soc-2008-mxcurioni/intern/elbeem/intern/solver_init.cpp
    branches/soc-2008-mxcurioni/intern/elbeem/intern/solver_relax.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_Rect.h
    branches/soc-2008-mxcurioni/intern/ghost/SConscript
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_sys_types.h
    branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
    branches/soc-2008-mxcurioni/intern/mikktspace/mikktspace.c
    branches/soc-2008-mxcurioni/intern/opennl/SConscript
    branches/soc-2008-mxcurioni/intern/tools/credits_svn_gen.py
    branches/soc-2008-mxcurioni/intern/utfconv/SConscript
    branches/soc-2008-mxcurioni/intern/utfconv/utf_winfunc.c
    branches/soc-2008-mxcurioni/release/datafiles/splash.png
    branches/soc-2008-mxcurioni/release/plugins/sequence/blur.c
    branches/soc-2008-mxcurioni/release/plugins/texture/clouds2.c
    branches/soc-2008-mxcurioni/release/plugins/texture/tiles.c
    branches/soc-2008-mxcurioni/release/scripts/modules/addon_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/blend_render_info.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/mesh.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2008-mxcurioni/release/scripts/startup/keyingsets_builtins.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_modal_timer.py
    branches/soc-2008-mxcurioni/release/windows/installer/00.sconsblender.nsi
    branches/soc-2008-mxcurioni/source/SConscript
    branches/soc-2008-mxcurioni/source/blender/avi/intern/avi.c
    branches/soc-2008-mxcurioni/source/blender/avi/intern/codecs.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_armature.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_lattice.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mball.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_movieclip.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_particle.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_pointcache.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_report.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_subsurf.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_tessmesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
    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/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/deform.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/dynamicpaint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/editderivedmesh.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/idprop.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/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/mesh_validate.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/navmesh_conversion.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/nla.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ocean.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/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/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/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/tracking.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_array.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_pbvh.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_winstuff.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenlib/SConscript
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdtree.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/DLRB_tree.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/dynlib.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fnmatch.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/listbase.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color_inline.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/math_vector.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/rand.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/scanfill.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string_utf8.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_sys_types.h
    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/blenpluginapi/SConscript
    branches/soc-2008-mxcurioni/source/blender/bmesh/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/bmesh/SConscript
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_construct.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_iterators.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_iterators.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mods.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mods.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_private.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_walkers.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_bevel.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_connect.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_create.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_dissolve.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_dupe.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_extrude.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_inset.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_join_triangles.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_mirror.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_primitive.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_slide.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_subdivide.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_subdivide.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_triangulate.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/tools/BME_bevel.c
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/CameraExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/EffectExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ErrorHandler.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/GeometryExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/ImageExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/LightExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/MaterialExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/MaterialExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/SceneExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/TransformReader.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/TransformWriter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.cpp
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/SConscript
    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/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/datafiles/splash.png.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/startup.blend.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/BIF_glutil.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframing.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_numinput.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_render.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_uvedit.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_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/mesh/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_bvh.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_bvh.h
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loopcut.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_rip.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_slide.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_navmesh.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/SConscript
    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/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/physics/dynamicpaint_ops.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/render/SConscript
    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/render/render_update.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/SConscript
    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_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/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_hide.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
    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_vertex.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/space_action.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/space_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_graph_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/space_clip.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/SConscript
    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/fsmenu.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/space_graph.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/SConscript
    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_info/info_stats.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_buttons.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/space_nla.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.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_text/text_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_python.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_userpref/space_userpref.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/SConscript
    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/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_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_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/crazyspace.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/ed_util.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_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_intern.h
    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_smart_stitch.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2008-mxcurioni/source/blender/gpu/SConscript
    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/gpu/intern/gpu_shader_material.glsl
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/SConscript
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/bmp.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/ColorBlock.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/PixelFormat.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/indexer.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jp2.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/jpeg.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/png.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/radiance_hdr.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/targa.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/tiff.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/util.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_key_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/SConscript
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/SConscript
    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_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_key.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.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_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui.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/intern/MOD_array.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cast.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_collision.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.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_mask.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_remesh.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.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_util.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_warp.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/SConscript
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_common.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_math.c
    branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/soc-2008-mxcurioni/source/blender/python/SConscript
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types_customdata.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_utils.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils.h
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_import.c
    branches/soc-2008-mxcurioni/source/blender/render/SConscript
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.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_blibvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_hint.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_instance.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_svbvh.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/initrender.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/render_result.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.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/sunsky.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/SConscript
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.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/creator/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/KX_HashedPtr.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
    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_ObstacleSimulation.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SteeringActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SteeringActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_FramingManager.h
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_ParentRelation.h
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/SConscript
    branches/soc-2008-mxcurioni/source/tests/bl_mesh_modifiers.py
    branches/soc-2008-mxcurioni/source/tools/spell_check_source_config.py
    branches/soc-2008-mxcurioni/source/tools/uncrustify_clean.sh

Added Paths:
-----------
    branches/soc-2008-mxcurioni/build_files/scons/config/win64-mingw-config.py
    branches/soc-2008-mxcurioni/doc/python_api/examples/bpy.types.Mesh.py
    branches/soc-2008-mxcurioni/extern/carve/patches/mingw_w64.patch
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/modal_solver.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/modal_solver.h
    branches/soc-2008-mxcurioni/extern/libmv/patches/mingw_w64_support.patch
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_binning.cpp
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_binning.h
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_split.cpp
    branches/soc-2008-mxcurioni/intern/cycles/bvh/bvh_split.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_task.cpp
    branches/soc-2008-mxcurioni/intern/cycles/util/util_task.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_lasso.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/lasso.c

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_editVert.h

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/intern/tools/credits_svn_gen.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
Modified: svn:ignore
   - *.pdb
.*
TAGS
cscope.out
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
CMakeFiles
CMakeCache.txt
blender.bin

   + *.pdb
.*
TAGS
cscope.out
sgc.bat
sgd.bat
smc.bat
ssenv.bat
tags
user-config.py
CMakeFiles
CMakeCache.txt
blender.bin
blender.kdev4
.kdev4

Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-45820
   + /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:34011-39896,39898-40096,40098-44221,44223-44419,44421-46045

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2012-04-29 00:44:49 UTC (rev 46057)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2012-04-29 00:59:04 UTC (rev 46058)
@@ -194,12 +194,7 @@
 option(WITH_IMAGE_FRAMESERVER   "Enable image FrameServer Support for rendering" ON)
 
 # Audio/Video format support
-if(MINGW)
-	set(PLATFORM_DEFAULT ON)
-else()
-	set(PLATFORM_DEFAULT OFF)
-endif()
-option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" ${PLATFORM_DEFAULT})
+option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
 unset(PLATFORM_DEFAULT)
 
 option(WITH_CODEC_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
@@ -233,6 +228,8 @@
 	option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
 endif()
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
+option(WITH_MINGW64                   "Use the 64-bit version of MinGW" OFF)
+mark_as_advanced(WITH_MINGW64)
 
 # Cycles
 option(WITH_CYCLES					"Enable cycles Render Engine" ON)
@@ -370,10 +367,9 @@
 		                    "because it is currently unsupported, remove this "
 		                    "line if youre a developer who wants to add support.")
 	endif()
-
-	if((NOT WITH_CODEC_FFMPEG) AND (WITH_CYCLES OR WITH_IMAGE_OPENEXR OR WITH_IMAGE_TIFF))
-		message(FATAL_ERROR "MINGW has a problem with: WITH_CYCLES/WITH_IMAGE_OPENEXR/WITH_IMAGE_TIFF "
-		                    "when WITH_CODEC_FFMPEG is disabled, enable FFMPEG or disable CYCLES/EXR/TIFF.")
+	
+	if((WITH_MINGW64) AND (WITH_OPENCOLLADA OR WITH_CODEC_FFMPEG))
+		message(FATAL_ERROR "MINGW64 still doesn't support: WITH_OPENCOLLADA/WITH_CODEC_FFMPEG")
 	endif()
 endif()
 
@@ -740,14 +736,24 @@
 	# this file is included anyway when building under Windows with cl.exe
 	#  include(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
 
-	set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
+	if(CMAKE_COMPILER_IS_GNUCC)
+		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
 
-	# Setup 64bit and 64bit windows systems
-	if(CMAKE_CL_64)
-		message("64 bit compiler detected.")
-		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
+		# Setup 64bit and 64bit windows systems		
+		if(WITH_MINGW64)
+			message("Set 64 bit compiler for MinGW.")
+			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
+		endif()
+	else()
+		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows)
+
+		# Setup 64bit and 64bit windows systems
+		if(CMAKE_CL_64)
+			message("64 bit compiler detected.")
+			set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
+		endif()
 	endif()
-
+		
 	add_definitions(-DWIN32)
 
 	if(WITH_INTERNATIONAL)
@@ -796,34 +802,36 @@
 	endif()
 
 	if(MSVC)
-		if(CMAKE_CL_64)
-			set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
-		else()
-			set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
-		endif()
+		set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
 
 		add_definitions(/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB)
 
-		set(CMAKE_CXX_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
-		set(CMAKE_C_FLAGS   "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
+		set(CMAKE_CXX_FLAGS "/nologo /J /Gd /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
+		set(CMAKE_C_FLAGS   "/nologo /J /Gd"       CACHE STRING "MSVC MT C++ flags " FORCE)
 
 		if(CMAKE_CL_64)
-			set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+			set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /Zi" CACHE STRING "MSVC MT flags " FORCE)
 		else()
-			set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+			set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /ZI" CACHE STRING "MSVC MT flags " FORCE)
 		endif()
-		set(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
-		set(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
-		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+		set(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /MT" CACHE STRING "MSVC MT flags " FORCE)
+		set(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /MT" CACHE STRING "MSVC MT flags " FORCE)
+		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /MT /Zi" CACHE STRING "MSVC MT flags " FORCE)
 		if(CMAKE_CL_64)
-			set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+			set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /Zi" CACHE STRING "MSVC MT flags " FORCE)
 		else()
-			set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+			set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /ZI" CACHE STRING "MSVC MT flags " FORCE)
 		endif()
-		set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
-		set(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
-		set(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+		set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MT" CACHE STRING "MSVC MT flags " FORCE)
+		set(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /MT" CACHE STRING "MSVC MT flags " FORCE)
+		set(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /MT /Zi" CACHE STRING "MSVC MT flags " FORCE)
 
+		# most msvc warnings are C & C++
+		set(_WARNINGS "/W3 /wd4018 /wd4244 /wd4305 /wd4800 /wd4181 /wd4065 /wd4267 /we4013")
+		set(C_WARNINGS "${_WARNINGS}")
+		set(CXX_WARNINGS "${_WARNINGS}")
+		unset(_WARNINGS)
+
 		if(WITH_INTERNATIONAL)
 			set(GETTEXT ${LIBDIR}/gettext)
 			set(GETTEXT_INCLUDE_DIRS ${GETTEXT}/include)
@@ -995,29 +1003,44 @@
 
 		set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
 
-	else()
-		# keep GCC specific stuff here
-		if(CMAKE_COMPILER_IS_GNUCC)
-			set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi")
-			set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
+		# used in many places so include globally, like OpenGL
+		blender_include_dirs("${PTHREADS_INCLUDE_DIRS}")
 
-			add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
+	elseif(CMAKE_COMPILER_IS_GNUCC)
+	# keep GCC specific stuff here		
+		set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi")
+		set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
+
+		if(WITH_MINGW64)
+			#Yes, the point for MinGW64 is moar optimization by default :)
+			set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2 -ftree-vectorize")
+			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+			set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
+			
+			add_definitions(-DFREE_WINDOWS64 -DMS_WIN64)
 		endif()
 
+		add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
+
+
 		add_definitions(-DFREE_WINDOWS)
 
 		if(WITH_INTERNATIONAL)
-			set(GETTEXT ${LIBDIR}/gcc/gettext)
+			set(GETTEXT ${LIBDIR}/gettext)
 			set(GETTEXT_INCLUDE_DIRS ${GETTEXT}/include)
 			set(GETTEXT_LIBPATH ${GETTEXT}/lib)
 			set(GETTEXT_LIBRARIES intl)
 		endif()
 		
-		set(PNG "${LIBDIR}/gcc/png")
+		set(PNG "${LIBDIR}/png")
 		set(PNG_INCLUDE_DIR "${PNG}/include")
 		set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
 
-		set(JPEG_LIBRARIES libjpeg)
+		if(WITH_MINGW64)
+			set(JPEG_LIBRARIES jpeg)
+		else()
+			set(JPEG_LIBRARIES libjpeg)
+		endif()
 		set(PNG_LIBRARIES png)
 
 		set(ZLIB ${LIBDIR}/zlib)
@@ -1025,31 +1048,34 @@
 		set(ZLIB_LIBPATH ${ZLIB}/lib)
 		set(ZLIB_LIBRARIES z)
 
-		set(PTHREADS ${LIBDIR}/pthreads)
-		set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
-		set(PTHREADS_LIBPATH ${PTHREADS}/lib)
-		set(PTHREADS_LIBRARIES pthreadGC2)
-
-		set(FREETYPE ${LIBDIR}/gcc/freetype)
+		#comes with own pthread library
+		if(NOT WITH_MINGW64)
+			set(PTHREADS ${LIBDIR}/pthreads)
+			set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
+			set(PTHREADS_LIBPATH ${PTHREADS}/lib)
+			set(PTHREADS_LIBRARIES pthreadGC2)
+		endif()
+		
+		set(FREETYPE ${LIBDIR}/freetype)
 		set(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
 		set(FREETYPE_LIBPATH ${FREETYPE}/lib)
 		set(FREETYPE_LIBRARY freetype)
 
 		if(WITH_FFTW3)
-			set(FFTW3 ${LIBDIR}/gcc/fftw3)
+			set(FFTW3 ${LIBDIR}/fftw3)
 			set(FFTW3_LIBRARIES fftw3)
 			set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
 			set(FFTW3_LIBPATH ${FFTW3}/lib)
 		endif()
 

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list