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

Sat Apr 14 12:38:11 CEST 2012

Revision: 45620
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45620
Author:   kjym3
Date:     2012-04-14 10:38:11 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 45619.

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/linuxcross-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
    branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
    branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
    branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt
    branches/soc-2008-mxcurioni/extern/libmv/ChangeLog
    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/simple_pipeline/resect.cc
    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/config.h
    branches/soc-2008-mxcurioni/intern/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/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_camera.cpp
    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_shader.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/device/device_opencl.cpp
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_accumulate.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/bsdf_microfacet.h
    branches/soc-2008-mxcurioni/intern/cycles/render/background.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/background.h
    branches/soc-2008-mxcurioni/intern/cycles/render/scene.h
    branches/soc-2008-mxcurioni/intern/cycles/render/shader.cpp
    branches/soc-2008-mxcurioni/intern/cycles/util/util_math.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_transform.cpp
    branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_EdgeCollapser.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsWin32.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
    branches/soc-2008-mxcurioni/intern/utfconv/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/utfconv/SConscript
    branches/soc-2008-mxcurioni/intern/utfconv/utf_winfunc.c
    branches/soc-2008-mxcurioni/intern/utfconv/utf_winfunc.h
    branches/soc-2008-mxcurioni/intern/utfconv/utfconv.c
    branches/soc-2008-mxcurioni/intern/utfconv/utfconv.h
    branches/soc-2008-mxcurioni/release/datafiles/ctodata.py
    branches/soc-2008-mxcurioni/release/datafiles/datatoc.py
    branches/soc-2008-mxcurioni/release/plugins/sequence/color-correction-hsv.c
    branches/soc-2008-mxcurioni/release/plugins/sequence/color-correction-yuv.c
    branches/soc-2008-mxcurioni/release/plugins/sequence/dnr.c
    branches/soc-2008-mxcurioni/release/plugins/sequence/gamma.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/bpy_extras/mesh_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
    branches/soc-2008-mxcurioni/release/scripts/modules/console_python.py
    branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/back_to_black.xml
    branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/blender_24x.xml
    branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/elsyiun.xml
    branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/hexagon.xml
    branches/soc-2008-mxcurioni/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
    branches/soc-2008-mxcurioni/release/scripts/presets/keyconfig/maya.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/clip.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object_randomize_transform.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_operators/vertexpaint_dirt.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/view3d.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_object.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2008-mxcurioni/release/scripts/templates/addon_add_object.py
    branches/soc-2008-mxcurioni/source/blender/avi/intern/avi.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_translation.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cloth.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_global.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_key.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_particle.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_text.h
    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/blender.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/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/editderivedmesh.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/library.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.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/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.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/tracking.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/unit.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_rect.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_winstuff.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_dynstr.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_base.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/noise.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/rct.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/winstuff.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/bmesh/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_class.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_marking.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.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_opdefines.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.c
    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_structure.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_edgesplit.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_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/collada/DocumentExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/preview.blend.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/startup.blend.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
    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_layout.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_bvh.c
    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_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_shapekey.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/screen/area.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_hide.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_buttons.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_logic/space_logic.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/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_snap.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/editors/util/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/util/crazyspace.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_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/imbuf/intern/IMB_anim.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/imageprocess.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_armature_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_genfile.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_key_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_smoke_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_define.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_group.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_pose.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_smoke.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.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_displace.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_ocean.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/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/modifiers/intern/MOD_weightvg_util.h
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/soc-2008-mxcurioni/source/blender/python/SConscript
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types_select.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/idprop_py_api.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/idprop_py_api.h
    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/render/extern/include/RE_engine.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/external_engine.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/sunsky.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/creator/creator.c
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertProperties.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SConscript
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_System.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Material.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Material.h
    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_Dome.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RayCast.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SteeringActuator.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/Physics/Bullet/CcdGraphicController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_BBox.cpp
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_BBox.h
    branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/VideoFFmpeg.h
    branches/soc-2008-mxcurioni/source/tools/update_themes.py

Added Paths:
-----------
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/rigid_registration.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/rigid_registration.h
    branches/soc-2008-mxcurioni/extern/libmv/third_party/glog/src/config_hurd.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_slide.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_slide.c

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/extern/libmv/libmv/image/array_nd.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/image/convolve.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/conditioning.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/euclidean_resection.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/fundamental.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/projection.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/multiview/triangulation.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/numeric/numeric.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/numeric/poly.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/bundle.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/callbacks.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/camera_intrinsics.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/detect.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/intersect.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/reconstruction.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/resect.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/simple_pipeline/tracks.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/brute_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/esm_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/hybrid_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/klt_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/pyramid_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/retrack_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/trklt_region_tracker.cc
    branches/soc-2008-mxcurioni/release/datafiles/ctodata.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_buttons.c


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
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-45431
   + /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-45619

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================

--- branches/soc-2008-mxcurioni/CMakeLists.txt	2012-04-14 05:09:23 UTC (rev 45619)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2012-04-14 10:38:11 UTC (rev 45620)
@@ -149,11 +149,14 @@
 
 # (unix defaults to OpenMP On)
 if(UNIX AND NOT APPLE)
-	option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
+	set(PLATFORM_DEFAULT ON)
 else()
-	option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" OFF)
+	set(PLATFORM_DEFAULT OFF)
 endif()
+option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" PLATFORM_DEFAULT)
+unset(PLATFORM_DEFAULT)
 
+
 if(UNIX AND NOT APPLE)
 	option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)"	ON)
 	option(WITH_X11_XF86VMODE "Enable X11 video mode switching"	ON)
@@ -304,8 +307,8 @@
 	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()
 
-if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
-	message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG require WITH_AUDASPACE")
+if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK OR WITH_GAMEENGINE))
+	message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG/WITH_GAMEENGINE require WITH_AUDASPACE")
 endif()
 
 if(NOT WITH_SDL AND WITH_GHOST_SDL)
@@ -325,13 +328,6 @@
 	message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
 endif()
 
-if(MINGW)
-	if(WITH_CODEC_QUICKTIME)
-		message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
-							"because it is currently unsupported, remove this "
-							"line if youre a developer who wants to add support.")
-	endif()
-endif()
 
 if(NOT WITH_FFTW3 AND WITH_MOD_OCEANSIM)
 	message(FATAL_ERROR "WITH_MOD_OCEANSIM requires WITH_FFTW3 to be ON")
@@ -358,7 +354,7 @@
 endif()
 
 if(WITH_GHOST_SDL OR WITH_HEADLESS)
-    set(WITH_GHOST_XDND OFF)
+	set(WITH_GHOST_XDND OFF)
 endif()
 
 TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
@@ -1660,6 +1656,7 @@
 	info_cfg_option(WITH_X11_XF86VMODE)
 	info_cfg_option(WITH_X11_XINPUT)
 	info_cfg_option(WITH_BUILTIN_GLEW)
+	info_cfg_option(WITH_MEM_JEMALLOC)
 
 	info_cfg_text("Image Formats:")
 	info_cfg_option(WITH_IMAGE_CINEON)

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py	2012-04-14 05:09:23 UTC (rev 45619)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/darwin-config.py	2012-04-14 10:38:11 UTC (rev 45620)
@@ -101,7 +101,7 @@
     WITH_BF_OPENMP = False
 
 # enable ffmpeg  support
-WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
 BF_FFMPEG = LIBDIR + '/ffmpeg'
 BF_FFMPEG_INC = "${BF_FFMPEG}/include"
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
@@ -233,24 +233,6 @@
 BF_FFTW3_LIB = 'libfftw3'
 BF_FFTW3_LIBPATH = '${BF_FFTW3}/lib'
 
-#WITH_BF_NSPR = True
-#BF_NSPR = $(LIBDIR)/nspr
-#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
-#BF_NSPR_LIB =
-
-# Uncomment the following line to use Mozilla inplace of netscape
-#CPPFLAGS += -DMOZ_NOT_NET
-# Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LIBDIR)/mozilla
-#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
-#BF_MOZILLA_LIB =
-# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
-# if this is not set.
-#
-# Be paranoid regarding library creation (do not update archives)
-#BF_PARANOID = True
-
-# enable freetype2 support for text objects
 BF_FREETYPE = LIBDIR + '/freetype'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype'

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py	2012-04-14 05:09:23 UTC (rev 45619)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/freebsd7-config.py	2012-04-14 10:38:11 UTC (rev 45620)
@@ -91,13 +91,12 @@
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-# enable freetype2 support for text objects
 BF_FREETYPE = '/usr/local'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype'
 
 ### XXX Find what this actually wants; it doesn't want libquicktime.
-WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False
 BF_QUICKTIME = '/usr/local'
 BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
 
@@ -110,7 +109,7 @@
 WITH_BF_BINRELOC = True
 
 # enable ffmpeg  support
-WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
 BF_FFMPEG = '/usr/local'
 BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py	2012-04-14 05:09:23 UTC (rev 45619)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/freebsd8-config.py	2012-04-14 10:38:11 UTC (rev 45620)
@@ -91,13 +91,12 @@
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-# enable freetype2 support for text objects
 BF_FREETYPE = '/usr/local'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype'
 
 ### XXX Find what this actually wants; it doesn't want libquicktime.
-WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False
 BF_QUICKTIME = '/usr/local'
 BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
 
@@ -110,7 +109,7 @@
 WITH_BF_BINRELOC = True
 
 # enable ffmpeg  support
-WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
 BF_FFMPEG = '/usr/local'
 BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py	2012-04-14 05:09:23 UTC (rev 45619)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/freebsd9-config.py	2012-04-14 10:38:11 UTC (rev 45620)
@@ -91,13 +91,12 @@
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-# enable freetype2 support for text objects
 BF_FREETYPE = '/usr/local'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype'
 
 ### XXX Find what this actually wants; it doesn't want libquicktime.
-WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False
 BF_QUICKTIME = '/usr/local'
 BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
 
@@ -110,7 +109,7 @@
 WITH_BF_BINRELOC = True
 
 # enable ffmpeg  support
-WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
 BF_FFMPEG = '/usr/local'
 BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py	2012-04-14 05:09:23 UTC (rev 45619)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/linux-config.py	2012-04-14 10:38:11 UTC (rev 45620)
@@ -105,13 +105,12 @@
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-# enable freetype2 support for text objects
 BF_FREETYPE = '/usr'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype'
 #BF_FREETYPE_LIB_STATIC = '${BF_FREETYPE}/lib/libfreetype.a'
 
-WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False
 BF_QUICKTIME = '/usr/local'
 BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
 
@@ -124,7 +123,7 @@
 WITH_BF_BINRELOC = True
 
 # enable ffmpeg  support
-WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True
 BF_FFMPEG = LIBDIR + '/ffmpeg'
 if os.path.exists(LCGDIR + '/ffmpeg'):
     WITH_BF_STATICFFMPEG = True

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/linuxcross-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/linuxcross-config.py	2012-04-14 05:09:23 UTC (rev 45619)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/linuxcross-config.py	2012-04-14 10:38:11 UTC (rev 45620)
@@ -100,14 +100,13 @@
 BF_WINTAB = LIBDIR + '/wintab'
 BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
 
-# enable freetype2 support for text objects
 BF_WITH_FREETYPE = True
 BF_FREETYPE = LIBDIR + '/gcc/freetype'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype'
 BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
 
-WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+WITH_BF_QUICKTIME = False
 BF_QUICKTIME = '/usr/local'
 BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
 
@@ -120,7 +119,7 @@
 WITH_BF_BINRELOC = False
 
 # enable ffmpeg  support
-WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True

@@ Diff output truncated at 10240 characters. @@

