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

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Wed Feb 29 22:35:52 CET 2012


Revision: 44565
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44565
Author:   kjym3
Date:     2012-02-29 21:35:49 +0000 (Wed, 29 Feb 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 44561.

Conflicts resolved:
source/blender/bmesh/bmesh.h
source/blender/bmesh/bmesh_operators.h
source/blenderplayer/bad_level_call_stubs/stubs.c

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/GNUmakefile
    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/scons/config/win32-mingw-config.py
    branches/soc-2008-mxcurioni/doc/doxygen/Doxyfile
    branches/soc-2008-mxcurioni/doc/doxygen/doxygen.source
    branches/soc-2008-mxcurioni/extern/libmv/patches/series
    branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_CarveInterface.cpp
    branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_MathUtils.cpp
    branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Merge2.cpp
    branches/soc-2008-mxcurioni/intern/bsp/intern/BSP_CSGMesh.h
    branches/soc-2008-mxcurioni/intern/container/CTR_List.h
    branches/soc-2008-mxcurioni/intern/cycles/app/cycles_xml.cpp
    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_object.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/kernel/kernel_accumulate.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_camera.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_displace.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_light.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_montecarlo.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_passes.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/render/attribute.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/attribute.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/camera.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/camera.h
    branches/soc-2008-mxcurioni/intern/cycles/render/film.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/integrator.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/light.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/mesh.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/scene.cpp
    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_opencl.cpp
    branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_ExternNormalEditor.h
    branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_FaceNormalEditor.h
    branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_ManMesh2.h
    branches/soc-2008-mxcurioni/intern/decimation/intern/LOD_MeshPrimitives.h
    branches/soc-2008-mxcurioni/intern/decimation/intern/future/LOD_ExternVColorEditor.h
    branches/soc-2008-mxcurioni/intern/decimation/intern/future/LOD_NdQuadric.h
    branches/soc-2008-mxcurioni/intern/decimation/intern/future/LOD_NdQuadricEditor.cpp
    branches/soc-2008-mxcurioni/intern/decimation/intern/future/LOD_NdQuadricEditor.h
    branches/soc-2008-mxcurioni/intern/ghost/GHOST_C-api.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_NDOFManager.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemPathsX11.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowSDL.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.h
    branches/soc-2008-mxcurioni/intern/guardedalloc/test/simpletest/memtest.c
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_extras/io_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
    branches/soc-2008-mxcurioni/release/scripts/presets/keyconfig/maya.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.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/source/blender/avi/AVI_avi.h
    branches/soc-2008-mxcurioni/source/blender/avi/intern/avi.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
    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_bmesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_brush.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cloth.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_collision.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_depsgraph.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_effect.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_icons.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_idcode.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_idprop.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_image.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_library.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_material.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_node.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.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_sequencer.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sketch.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_subsurf.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_text.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenkernel/depsgraph_private.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/booleanops_mesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/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/group.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/icons.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/implicit.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.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/multires.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/nla.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ocean.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/seqeffects.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sketch.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.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/blenlib/BLI_dlrbTree.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_graph.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_mempool.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdtree.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_mempool.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/edgehash.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/freetypefont.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/jitter.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/md5.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/scanfill.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/string_utf8.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_writefile.h
    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.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_class.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_error.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_operator_api.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_construct.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_inline.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_interp.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_iterators.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_iterators_inline.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh.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_inline.c
    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_structure.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/intern/bmesh_walkers_private.h
    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_join_triangles.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_mesh_conv.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_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/AnimationImporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/ExtraHandler.h
    branches/soc-2008-mxcurioni/source/blender/collada/ExtraTags.h
    branches/soc-2008-mxcurioni/source/blender/collada/TransformWriter.cpp
    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/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/meshlaplacian.h
    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/armature/reeb.h
    branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/startup.blend.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_armature.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_curve.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_gpencil.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_screen.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_transform.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_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/bmesh_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/bmesh_selecthistory.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/bmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/bmesh_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/knifetool.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/loopcut.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/object/object_bake.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.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/physics/physics_fluid.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/glutil.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_toolbar.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_ops.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_graph/graph_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.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_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_templates.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_tree.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
    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.h
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_intern.h
    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/GPU_buffers.h
    branches/soc-2008-mxcurioni/source/blender/gpu/GPU_material.h
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.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/IMB_imbuf.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/IMB_allocimbuf.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/IMB_filetype.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/IMB_metadata.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/cineonlib.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/logImageLib.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/metadata.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/scaling.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/thumbs_blend.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_actuator_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_node_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_force.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.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_wm.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_util.h
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_uvproject.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.h
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_outputFile.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_splitViewer.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_exec.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_util.h
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_tree.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.h
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output_material.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_output_world.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    branches/soc-2008-mxcurioni/source/blender/nodes/texture/node_texture_tree.c
    branches/soc-2008-mxcurioni/source/blender/nodes/texture/node_texture_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/texture/node_texture_util.h
    branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/soc-2008-mxcurioni/source/blender/nodes/texture/nodes/node_texture_viewer.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_api.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.h
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_utils.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/idprop_py_api.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app_handlers.h
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.h
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_anim.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils.c
    branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
    branches/soc-2008-mxcurioni/source/blender/quicktime/quicktime_export.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/initrender.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/pixelblending.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/rendercore.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/renderdatabase.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/shading.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/strand.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/texture_ocean.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/include/voxeldata.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/bvh.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/reorganize.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/gammaCorrectionTables.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/sunsky.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_gesture.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/wm.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_event_types.h
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/Operator2Expr.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.h
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_Engine.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_MouseDevice.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_KeyboardDevice.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Camera.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MeshProxy.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolyProxy.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyConstraintBinding.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SteeringActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_VertexProxy.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_TexVert.cpp

Added Paths:
-----------
    branches/soc-2008-mxcurioni/extern/libmv/patches/clang-3.diff
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_construct.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_core.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_interp.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_iterators.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mods.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_walkers.h
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_select.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_select.h

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bmeshCustomData.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_iterators.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_marking.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_operators.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_queries.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/bmesh_walkers.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/docs/
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_newcore.c

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_smallhash.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_sparsemap.h
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/knifetool.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/


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-44436
   + /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-44561

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2012-02-29 19:55:54 UTC (rev 44564)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2012-02-29 21:35:49 UTC (rev 44565)
@@ -1033,8 +1033,8 @@
 		if(WITH_BOOST)
 			set(BOOST ${LIBDIR}/boost)
 			set(BOOST_INCLUDE_DIR ${BOOST}/include)
-			set(BOOST_POSTFIX "mgw45-mt-s-1_47")
-			set(BOOST_DEBUG_POSTFIX "mgw45-mt-sd-1_47")
+			set(BOOST_POSTFIX "mgw46-mt-s-1_47")
+			set(BOOST_DEBUG_POSTFIX "mgw46-mt-sd-1_47")
 			set(BOOST_LIBRARIES
 				optimized boost_date_time-${BOOST_POSTFIX} boost_filesystem-${BOOST_POSTFIX}
 				boost_regex-${BOOST_POSTFIX} boost_system-${BOOST_POSTFIX} boost_thread-${BOOST_POSTFIX}
@@ -1497,9 +1497,9 @@
 endif()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-	if(WITH_IK_ITASC)
-		message(WARNING "Using Clang as CXX compiler: disabling WITH_IK_ITASC, this feature will be missing.")
-		set(WITH_IK_ITASC OFF)
+	if(WITH_LIBMV)
+		message(WARNING "Using Clang as CXX compiler: disabling WITH_LIBMV, this feature will be missing.")
+		set(WITH_LIBMV OFF)
 	endif()
 endif()
 

Modified: branches/soc-2008-mxcurioni/GNUmakefile
===================================================================
--- branches/soc-2008-mxcurioni/GNUmakefile	2012-02-29 19:55:54 UTC (rev 44564)
+++ branches/soc-2008-mxcurioni/GNUmakefile	2012-02-29 21:35:49 UTC (rev 44565)
@@ -258,7 +258,7 @@
 	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
 
 doc_doxy:
-	cd doc/doxygen; doxygen 
+	cd doc/doxygen; doxygen Doxyfile
 	@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
 
 doc_dna:

Modified: branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py	2012-02-29 19:55:54 UTC (rev 44564)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/slave_compile.py	2012-02-29 21:35:49 UTC (rev 44565)
@@ -55,7 +55,7 @@
     # scons
     os.chdir(blender_dir)
     scons_cmd = ['python', 'scons/scons.py']
-    scons_options = []
+    scons_options = ['BF_FANCY=False']
 
     if builder.find('linux') != -1:
         import shutil
@@ -65,7 +65,7 @@
         build_dir = os.path.join('..', 'build', builder)
         install_dir = os.path.join('..', 'install', builder)
 
-        common_options = ['BF_INSTALLDIR=' + install_dir]
+        common_options = ['BF_INSTALLDIR=' + install_dir] + scons_options
 
         # Clean install directory so we'll be sure there's no
         if os.path.isdir(install_dir):

Modified: branches/soc-2008-mxcurioni/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/buildbot/slave_pack.py	2012-02-29 19:55:54 UTC (rev 44564)
+++ branches/soc-2008-mxcurioni/build_files/buildbot/slave_pack.py	2012-02-29 21:35:49 UTC (rev 44565)
@@ -41,7 +41,7 @@
 # scons does own packaging
 if builder.find('scons') != -1:
     os.chdir('../blender')
-    scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave']
+    scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave', 'BF_FANCY=False']
 
     if builder.find('linux') != -1:
         buildbot_dir = os.path.dirname(os.path.realpath(__file__))

Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py	2012-02-29 19:55:54 UTC (rev 44564)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-mingw-config.py	2012-02-29 21:35:49 UTC (rev 44565)
@@ -163,7 +163,7 @@
 WITH_BF_BOOST = True
 BF_BOOST = LIBDIR + '/boost'
 BF_BOOST_INC = BF_BOOST + '/include'
-BF_BOOST_LIB = 'boost_date_time-mgw45-mt-s-1_47 boost_filesystem-mgw45-mt-s-1_47 boost_regex-mgw45-mt-s-1_47 boost_system-mgw45-mt-s-1_47 boost_thread-mgw45-mt-s-1_47'
+BF_BOOST_LIB = 'boost_date_time-mgw46-mt-s-1_47 boost_filesystem-mgw46-mt-s-1_47 boost_regex-mgw46-mt-s-1_47 boost_system-mgw46-mt-s-1_47 boost_thread-mgw46-mt-s-1_47'
 BF_BOOST_LIBPATH = BF_BOOST + '/lib/gcc'
 
 #Ray trace optimization

Modified: branches/soc-2008-mxcurioni/doc/doxygen/Doxyfile
===================================================================
--- branches/soc-2008-mxcurioni/doc/doxygen/Doxyfile	2012-02-29 19:55:54 UTC (rev 44564)
+++ branches/soc-2008-mxcurioni/doc/doxygen/Doxyfile	2012-02-29 21:35:49 UTC (rev 44565)
@@ -31,7 +31,7 @@
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = "V2.59"
+PROJECT_NUMBER         = "V2.6x"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
@@ -648,7 +648,7 @@
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = ../../source/gameengine/PyDoc
+EXCLUDE                = ../../build_files, ../../release
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix file system feature) are excluded 
@@ -662,7 +662,7 @@
 # against the file with absolute path, so to exclude all test directories 
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = .svn
+EXCLUDE_PATTERNS       = .svn .git *.py
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
 # (namespaces, classes, functions, etc.) that should be excluded from the 

Modified: branches/soc-2008-mxcurioni/doc/doxygen/doxygen.source
===================================================================
--- branches/soc-2008-mxcurioni/doc/doxygen/doxygen.source	2012-02-29 19:55:54 UTC (rev 44564)
+++ branches/soc-2008-mxcurioni/doc/doxygen/doxygen.source	2012-02-29 21:35:49 UTC (rev 44565)
@@ -8,14 +8,14 @@
 /** \defgroup render Rendering
  *  \ingroup blender
  */
-/** \defgroup meshedit Mesh Editing */
+/** \defgroup bmesh BMesh
+ *  \ingroup blender
+ */
 /** \defgroup texture Texturing */
 /** \defgroup compositor Compositing */
 
-/** \defgroup scripts Scripting */
-
 /** \defgroup python Python
- *  \ingroup blender scripts
+ *  \ingroup blender
  */
 
 /** \defgroup pygen Python Generic
@@ -332,7 +332,7 @@
  *  \ingroup imbuf
  */
 
-/** \defgorup imbdds DDS
+/** \defgroup imbdds DDS
  *  \ingroup imbuf
  */
 

Copied: branches/soc-2008-mxcurioni/extern/libmv/patches/clang-3.diff (from rev 44561, trunk/blender/extern/libmv/patches/clang-3.diff)
===================================================================
--- branches/soc-2008-mxcurioni/extern/libmv/patches/clang-3.diff	                        (rev 0)
+++ branches/soc-2008-mxcurioni/extern/libmv/patches/clang-3.diff	2012-02-29 21:35:49 UTC (rev 44565)
@@ -0,0 +1,49 @@
+Index: third_party/glog/src/utilities.h
+===================================================================
+--- third_party/glog/src/utilities.h	(revision 44501)
++++ third_party/glog/src/utilities.h	(working copy)
+@@ -105,7 +105,7 @@
+ # undef STACKTRACE_H
+ #elif defined(HAVE_LIB_UNWIND)
+ # define STACKTRACE_H "stacktrace_libunwind-inl.h"
+-#elif !defined(NO_FRAME_POINTER)
++#elif !defined(NO_FRAME_POINTER) && !defined(__clang__)
+ # if defined(__i386__) && __GNUC__ >= 2
+ #  define STACKTRACE_H "stacktrace_x86-inl.h"
+ # elif defined(__x86_64__) && __GNUC__ >= 2
+Index: third_party/glog/src/logging.cc
+===================================================================
+--- third_party/glog/src/logging.cc	(revision 44501)
++++ third_party/glog/src/logging.cc	(working copy)
+@@ -1231,6 +1231,14 @@
+ #endif
+ }
+ 
++#if defined(HAVE___ATTRIBUTE__)
++typedef void (*fail_func_t)() __attribute__((noreturn));
++static void logging_fail() __attribute__((noreturn));
++#else
++typedef void (*fail_func_t)();
++static void logging_fail();
++#endif
++
+ static void logging_fail() {
+ // #if defined(_DEBUG) && defined(_MSC_VER)
+ // doesn't work for my laptop (sergey)
+@@ -1243,14 +1251,9 @@
+ #endif
+ }
+ 
+-#ifdef HAVE___ATTRIBUTE__
+-GOOGLE_GLOG_DLL_DECL
+-void (*g_logging_fail_func)() __attribute__((noreturn)) = &logging_fail;
+-#else
+-GOOGLE_GLOG_DLL_DECL void (*g_logging_fail_func)() = &logging_fail;
+-#endif
++GOOGLE_GLOG_DLL_DECL fail_func_t g_logging_fail_func = &logging_fail;
+ 
+-void InstallFailureFunction(void (*fail_func)()) {
++void InstallFailureFunction(fail_func_t fail_func) {
+   g_logging_fail_func = fail_func;
+ }
+ 

Modified: branches/soc-2008-mxcurioni/extern/libmv/patches/series
===================================================================
--- branches/soc-2008-mxcurioni/extern/libmv/patches/series	2012-02-29 19:55:54 UTC (rev 44564)
+++ branches/soc-2008-mxcurioni/extern/libmv/patches/series	2012-02-29 21:35:49 UTC (rev 44565)
@@ -1,2 +1,3 @@
 v3d_verbosity.patch
 bundle_tweaks.patch
+clang-3.diff

Modified: branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_CarveInterface.cpp
===================================================================

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list