[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46056] branches/soc-2011-cucumber: Merged revisions 45967-46052 from trunk/blender

Daniel Stokes kupomail at gmail.com
Sun Apr 29 02:33:25 CEST 2012


Revision: 46056
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46056
Author:   kupoman
Date:     2012-04-29 00:33:24 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Merged revisions 45967-46052 from trunk/blender

Modified Paths:
--------------
    branches/soc-2011-cucumber/CMakeLists.txt
    branches/soc-2011-cucumber/SConstruct
    branches/soc-2011-cucumber/build_files/buildbot/master.cfg
    branches/soc-2011-cucumber/build_files/buildbot/master_unpack.py
    branches/soc-2011-cucumber/build_files/buildbot/slave_compile.py
    branches/soc-2011-cucumber/build_files/buildbot/slave_pack.py
    branches/soc-2011-cucumber/build_files/scons/tools/btools.py
    branches/soc-2011-cucumber/doc/manpage/blender.1
    branches/soc-2011-cucumber/extern/libmv/CMakeLists.txt
    branches/soc-2011-cucumber/extern/libmv/ChangeLog
    branches/soc-2011-cucumber/extern/libmv/files.txt
    branches/soc-2011-cucumber/extern/libmv/libmv-capi.cpp
    branches/soc-2011-cucumber/extern/libmv/libmv-capi.h
    branches/soc-2011-cucumber/intern/audaspace/intern/AUD_C-API.cpp
    branches/soc-2011-cucumber/intern/audaspace/intern/AUD_C-API.h
    branches/soc-2011-cucumber/intern/audaspace/intern/AUD_FileWriter.cpp
    branches/soc-2011-cucumber/intern/audaspace/intern/AUD_FileWriter.h
    branches/soc-2011-cucumber/intern/audaspace/intern/AUD_Reference.h
    branches/soc-2011-cucumber/intern/audaspace/intern/AUD_ReferenceHandler.cpp
    branches/soc-2011-cucumber/intern/container/CTR_Map.h
    branches/soc-2011-cucumber/intern/cycles/blender/addon/properties.py
    branches/soc-2011-cucumber/intern/cycles/blender/addon/ui.py
    branches/soc-2011-cucumber/intern/cycles/blender/blender_session.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/blender_sync.cpp
    branches/soc-2011-cucumber/intern/cycles/blender/blender_sync.h
    branches/soc-2011-cucumber/intern/cycles/bvh/CMakeLists.txt
    branches/soc-2011-cucumber/intern/cycles/bvh/bvh.cpp
    branches/soc-2011-cucumber/intern/cycles/bvh/bvh_build.cpp
    branches/soc-2011-cucumber/intern/cycles/bvh/bvh_build.h
    branches/soc-2011-cucumber/intern/cycles/bvh/bvh_node.cpp
    branches/soc-2011-cucumber/intern/cycles/bvh/bvh_node.h
    branches/soc-2011-cucumber/intern/cycles/bvh/bvh_params.h
    branches/soc-2011-cucumber/intern/cycles/bvh/bvh_sort.cpp
    branches/soc-2011-cucumber/intern/cycles/bvh/bvh_sort.h
    branches/soc-2011-cucumber/intern/cycles/device/device.cpp
    branches/soc-2011-cucumber/intern/cycles/device/device.h
    branches/soc-2011-cucumber/intern/cycles/device/device_cpu.cpp
    branches/soc-2011-cucumber/intern/cycles/device/device_multi.cpp
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_accumulate.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_path.h
    branches/soc-2011-cucumber/intern/cycles/kernel/kernel_types.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_tex_coord.h
    branches/soc-2011-cucumber/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2011-cucumber/intern/cycles/render/integrator.cpp
    branches/soc-2011-cucumber/intern/cycles/render/integrator.h
    branches/soc-2011-cucumber/intern/cycles/render/mesh.cpp
    branches/soc-2011-cucumber/intern/cycles/render/nodes.cpp
    branches/soc-2011-cucumber/intern/cycles/render/object.cpp
    branches/soc-2011-cucumber/intern/cycles/render/session.cpp
    branches/soc-2011-cucumber/intern/cycles/subd/subd_patch.cpp
    branches/soc-2011-cucumber/intern/cycles/util/CMakeLists.txt
    branches/soc-2011-cucumber/intern/cycles/util/util_boundbox.h
    branches/soc-2011-cucumber/intern/cycles/util/util_math.h
    branches/soc-2011-cucumber/intern/cycles/util/util_thread.h
    branches/soc-2011-cucumber/intern/cycles/util/util_transform.cpp
    branches/soc-2011-cucumber/intern/cycles/util/util_types.h
    branches/soc-2011-cucumber/intern/ghost/GHOST_Rect.h
    branches/soc-2011-cucumber/intern/guardedalloc/intern/mallocn.c
    branches/soc-2011-cucumber/intern/mikktspace/mikktspace.c
    branches/soc-2011-cucumber/intern/smoke/extern/smoke_API.h
    branches/soc-2011-cucumber/intern/smoke/intern/FLUID_3D.cpp
    branches/soc-2011-cucumber/intern/smoke/intern/FLUID_3D.h
    branches/soc-2011-cucumber/intern/smoke/intern/OBSTACLE.h
    branches/soc-2011-cucumber/intern/smoke/intern/WTURBULENCE.cpp
    branches/soc-2011-cucumber/intern/smoke/intern/smoke_API.cpp
    branches/soc-2011-cucumber/intern/tools/credits_svn_gen.py
    branches/soc-2011-cucumber/intern/utfconv/utf_winfunc.c
    branches/soc-2011-cucumber/release/datafiles/splash.png
    branches/soc-2011-cucumber/release/plugins/sequence/blur.c
    branches/soc-2011-cucumber/release/plugins/texture/clouds2.c
    branches/soc-2011-cucumber/release/plugins/texture/tiles.c
    branches/soc-2011-cucumber/release/scripts/modules/addon_utils.py
    branches/soc-2011-cucumber/release/scripts/modules/blend_render_info.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_common.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-cucumber/release/scripts/startup/keyingsets_builtins.py
    branches/soc-2011-cucumber/release/scripts/templates/operator_modal_timer.py
    branches/soc-2011-cucumber/source/blender/avi/intern/avi.c
    branches/soc-2011-cucumber/source/blender/avi/intern/codecs.c
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_curve.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_lattice.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_mball.h
    branches/soc-2011-cucumber/source/blender/blenkernel/BKE_movieclip.h
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/anim.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/armature.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/boids.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/bvhutils.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/cloth.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/collision.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/colortools.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/constraint.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/context.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/curve.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/deform.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/displist.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/editderivedmesh.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/effect.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/font.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/idprop.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/image.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/image_gen.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/implicit.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/ipo.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/key.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/lattice.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/library.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/material.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/mball.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/mesh.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/multires.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/navmesh_conversion.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/nla.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/object.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/ocean.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/packedFile.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/paint.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/particle.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/property.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/report.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/sca.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/shrinkwrap.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/sketch.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/smoke.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/softbody.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/sound.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/text.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/texture.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_array.h
    branches/soc-2011-cucumber/source/blender/blenlib/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/DLRB_tree.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/bpath.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/dynlib.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/fileops.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/freetypefont.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/graph.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/listbase.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/pbvh.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/string.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/string_utf8.c
    branches/soc-2011-cucumber/source/blender/blenloader/intern/readblenentry.c
    branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-cucumber/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-cucumber/source/blender/bmesh/bmesh.h
    branches/soc-2011-cucumber/source/blender/bmesh/intern/bmesh_construct.c
    branches/soc-2011-cucumber/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2011-cucumber/source/blender/bmesh/intern/bmesh_iterators.c
    branches/soc-2011-cucumber/source/blender/bmesh/intern/bmesh_iterators.h
    branches/soc-2011-cucumber/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/soc-2011-cucumber/source/blender/bmesh/intern/bmesh_mods.c
    branches/soc-2011-cucumber/source/blender/bmesh/intern/bmesh_walkers.c
    branches/soc-2011-cucumber/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/soc-2011-cucumber/source/blender/bmesh/operators/bmo_bevel.c
    branches/soc-2011-cucumber/source/blender/bmesh/operators/bmo_connect.c
    branches/soc-2011-cucumber/source/blender/bmesh/operators/bmo_create.c
    branches/soc-2011-cucumber/source/blender/bmesh/operators/bmo_dupe.c
    branches/soc-2011-cucumber/source/blender/bmesh/operators/bmo_extrude.c
    branches/soc-2011-cucumber/source/blender/bmesh/operators/bmo_inset.c
    branches/soc-2011-cucumber/source/blender/bmesh/operators/bmo_join_triangles.c
    branches/soc-2011-cucumber/source/blender/bmesh/operators/bmo_mirror.c
    branches/soc-2011-cucumber/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/soc-2011-cucumber/source/blender/bmesh/operators/bmo_subdivide.c
    branches/soc-2011-cucumber/source/blender/bmesh/operators/bmo_triangulate.c
    branches/soc-2011-cucumber/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2011-cucumber/source/blender/bmesh/tools/BME_bevel.c
    branches/soc-2011-cucumber/source/blender/collada/AnimationExporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/AnimationImporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/ArmatureExporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/CameraExporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/DocumentExporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/DocumentImporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/EffectExporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/ErrorHandler.cpp
    branches/soc-2011-cucumber/source/blender/collada/GeometryExporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/GeometryExporter.h
    branches/soc-2011-cucumber/source/blender/collada/ImageExporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/LightExporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/MaterialExporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/MaterialExporter.h
    branches/soc-2011-cucumber/source/blender/collada/MeshImporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/SceneExporter.cpp
    branches/soc-2011-cucumber/source/blender/collada/TransformReader.cpp
    branches/soc-2011-cucumber/source/blender/collada/TransformWriter.cpp
    branches/soc-2011-cucumber/source/blender/collada/collada_internal.cpp
    branches/soc-2011-cucumber/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2011-cucumber/source/blender/editors/animation/anim_filter.c
    branches/soc-2011-cucumber/source/blender/editors/animation/anim_markers.c
    branches/soc-2011-cucumber/source/blender/editors/animation/keyframing.c
    branches/soc-2011-cucumber/source/blender/editors/armature/editarmature.c
    branches/soc-2011-cucumber/source/blender/editors/armature/editarmature_generate.c
    branches/soc-2011-cucumber/source/blender/editors/armature/editarmature_retarget.c
    branches/soc-2011-cucumber/source/blender/editors/armature/editarmature_sketch.c
    branches/soc-2011-cucumber/source/blender/editors/armature/poseUtils.c
    branches/soc-2011-cucumber/source/blender/editors/armature/poselib.c
    branches/soc-2011-cucumber/source/blender/editors/armature/poseobject.c
    branches/soc-2011-cucumber/source/blender/editors/armature/reeb.c
    branches/soc-2011-cucumber/source/blender/editors/curve/editcurve.c
    branches/soc-2011-cucumber/source/blender/editors/curve/editfont.c
    branches/soc-2011-cucumber/source/blender/editors/datafiles/splash.png.c
    branches/soc-2011-cucumber/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2011-cucumber/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2011-cucumber/source/blender/editors/include/ED_anim_api.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_curve.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_keyframing.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_mesh.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_render.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_screen.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_uvedit.h
    branches/soc-2011-cucumber/source/blender/editors/include/ED_view3d.h
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_utils.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-cucumber/source/blender/editors/interface/resources.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editface.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_bvh.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_bvh.h
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_loopcut.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_rip.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_slide.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2011-cucumber/source/blender/editors/mesh/mesh_navmesh.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/meshtools.c
    branches/soc-2011-cucumber/source/blender/editors/metaball/mball_edit.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_add.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_bake.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_constraint.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_edit.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_group.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_hook.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_intern.h
    branches/soc-2011-cucumber/source/blender/editors/object/object_lattice.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_modifier.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_ops.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_relations.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_select.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_shapekey.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_transform.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-cucumber/source/blender/editors/physics/dynamicpaint_ops.c
    branches/soc-2011-cucumber/source/blender/editors/physics/particle_edit.c
    branches/soc-2011-cucumber/source/blender/editors/physics/physics_fluid.c
    branches/soc-2011-cucumber/source/blender/editors/render/render_shading.c
    branches/soc-2011-cucumber/source/blender/editors/render/render_update.c
    branches/soc-2011-cucumber/source/blender/editors/screen/area.c
    branches/soc-2011-cucumber/source/blender/editors/screen/glutil.c
    branches/soc-2011-cucumber/source/blender/editors/screen/screen_edit.c
    branches/soc-2011-cucumber/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2011-cucumber/source/blender/editors/sound/sound_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_action/space_action.c
    branches/soc-2011-cucumber/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2011-cucumber/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2011-cucumber/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/clip_graph_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/space_clip.c
    branches/soc-2011-cucumber/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_file/file_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_file/file_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_file/filelist.c
    branches/soc-2011-cucumber/source/blender/editors/space_file/filesel.c
    branches/soc-2011-cucumber/source/blender/editors/space_file/fsmenu.c
    branches/soc-2011-cucumber/source/blender/editors/space_file/space_file.c
    branches/soc-2011-cucumber/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2011-cucumber/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_graph/space_graph.c
    branches/soc-2011-cucumber/source/blender/editors/space_image/image_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_image/space_image.c
    branches/soc-2011-cucumber/source/blender/editors/space_info/info_stats.c
    branches/soc-2011-cucumber/source/blender/editors/space_logic/logic_buttons.c
    branches/soc-2011-cucumber/source/blender/editors/space_logic/logic_window.c
    branches/soc-2011-cucumber/source/blender/editors/space_logic/space_logic.c
    branches/soc-2011-cucumber/source/blender/editors/space_nla/nla_buttons.c
    branches/soc-2011-cucumber/source/blender/editors/space_nla/space_nla.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_templates.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/space_node.c
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_ops.c
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_text/text_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_time/space_time.c
    branches/soc-2011-cucumber/source/blender/editors/space_userpref/space_userpref.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_constraints.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_input.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_ops.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_orientations.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_snap.c
    branches/soc-2011-cucumber/source/blender/editors/util/crazyspace.c
    branches/soc-2011-cucumber/source/blender/editors/util/numinput.c
    branches/soc-2011-cucumber/source/blender/editors/util/undo.c
    branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_intern.h
    branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/soc-2011-cucumber/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/soc-2011-cucumber/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/dds/ColorBlock.cpp
    branches/soc-2011-cucumber/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/soc-2011-cucumber/source/blender/imbuf/intern/dds/PixelFormat.h
    branches/soc-2011-cucumber/source/blender/imbuf/intern/jpeg.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/soc-2011-cucumber/source/blender/imbuf/intern/png.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/radiance_hdr.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/targa.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/thumbs.c
    branches/soc-2011-cucumber/source/blender/imbuf/intern/util.c
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_object_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_smoke_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2011-cucumber/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2011-cucumber/source/blender/makesdna/intern/makesdna.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_main.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_meta.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_smoke.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_boolean.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_cast.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_collision.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_hook.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_mask.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_remesh.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_screw.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_warp.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
    branches/soc-2011-cucumber/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/node_shader_util.c
    branches/soc-2011-cucumber/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_math.c
    branches/soc-2011-cucumber/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/soc-2011-cucumber/source/blender/python/bmesh/bmesh_py_types_customdata.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-cucumber/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2011-cucumber/source/blender/quicktime/apple/quicktime_import.c
    branches/soc-2011-cucumber/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2011-cucumber/source/blender/render/intern/raytrace/bvh.h
    branches/soc-2011-cucumber/source/blender/render/intern/raytrace/rayobject.cpp
    branches/soc-2011-cucumber/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
    branches/soc-2011-cucumber/source/blender/render/intern/raytrace/rayobject_hint.h
    branches/soc-2011-cucumber/source/blender/render/intern/raytrace/rayobject_instance.cpp
    branches/soc-2011-cucumber/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2011-cucumber/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/soc-2011-cucumber/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/soc-2011-cucumber/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/soc-2011-cucumber/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/soc-2011-cucumber/source/blender/render/intern/raytrace/reorganize.h
    branches/soc-2011-cucumber/source/blender/render/intern/raytrace/svbvh.h
    branches/soc-2011-cucumber/source/blender/render/intern/raytrace/vbvh.h
    branches/soc-2011-cucumber/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/initrender.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/pointdensity.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/rayshade.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/render_result.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/render_texture.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/rendercore.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/renderdatabase.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/shadeoutput.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/sunsky.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/volume_precache.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/volumetric.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/voxeldata.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/zbuf.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-cucumber/source/gameengine/BlenderRoutines/SConscript
    branches/soc-2011-cucumber/source/gameengine/Converter/CMakeLists.txt
    branches/soc-2011-cucumber/source/gameengine/Converter/SConscript
    branches/soc-2011-cucumber/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2011-cucumber/source/gameengine/Ketsji/SConscript

Added Paths:
-----------
    branches/soc-2011-cucumber/extern/libmv/libmv/simple_pipeline/modal_solver.cc
    branches/soc-2011-cucumber/extern/libmv/libmv/simple_pipeline/modal_solver.h
    branches/soc-2011-cucumber/intern/cycles/bvh/bvh_binning.cpp
    branches/soc-2011-cucumber/intern/cycles/bvh/bvh_binning.h
    branches/soc-2011-cucumber/intern/cycles/bvh/bvh_split.cpp
    branches/soc-2011-cucumber/intern/cycles/bvh/bvh_split.h
    branches/soc-2011-cucumber/intern/cycles/util/util_task.cpp
    branches/soc-2011-cucumber/intern/cycles/util/util_task.h
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_lasso.h
    branches/soc-2011-cucumber/source/blender/blenlib/intern/lasso.c

Removed Paths:
-------------
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_editVert.h

Property Changed:
----------------
    branches/soc-2011-cucumber/
    branches/soc-2011-cucumber/build_files/
    branches/soc-2011-cucumber/extern/
    branches/soc-2011-cucumber/intern/
    branches/soc-2011-cucumber/intern/tools/credits_svn_gen.py
    branches/soc-2011-cucumber/release/
    branches/soc-2011-cucumber/source/blender/
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-cucumber
___________________________________________________________________
Modified: svn:mergeinfo
   - /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:36829-40545,40632-45967
/trunk/blender/source/darwin:41227-41228
   + /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:36829-40545,40632-46052
/trunk/blender/source/darwin:41227-41228

Modified: branches/soc-2011-cucumber/CMakeLists.txt
===================================================================
--- branches/soc-2011-cucumber/CMakeLists.txt	2012-04-29 00:28:03 UTC (rev 46055)
+++ branches/soc-2011-cucumber/CMakeLists.txt	2012-04-29 00:33:24 UTC (rev 46056)
@@ -802,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)
@@ -1001,6 +1003,9 @@
 
 		set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
 
+		# used in many places so include globally, like OpenGL
+		blender_include_dirs("${PTHREADS_INCLUDE_DIRS}")
+
 	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")
@@ -1154,9 +1159,6 @@
 
 	endif()
 
-	# used in many places so include globally, like OpenGL
-	blender_include_dirs("${PTHREADS_INCLUDE_DIRS}")
-
 elseif(APPLE)
 
 	if(${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.5" OR ${CMAKE_OSX_DEPLOYMENT_TARGET} STRGREATER "10.5")

Modified: branches/soc-2011-cucumber/SConstruct
===================================================================
--- branches/soc-2011-cucumber/SConstruct	2012-04-29 00:28:03 UTC (rev 46055)
+++ branches/soc-2011-cucumber/SConstruct	2012-04-29 00:33:24 UTC (rev 46056)
@@ -774,7 +774,7 @@
         dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb.dll')	
     dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
 
-    if env['WITH_BF_OIIO']:
+    if env['WITH_BF_OIIO'] and env['OURPLATFORM'] != 'win32-mingw':
         dllsources.append('${LCGDIR}/openimageio/bin/OpenImageIO.dll')
 
     dllsources.append('#source/icons/blender.exe.manifest')


Property changes on: branches/soc-2011-cucumber/build_files
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/build_files:41227-45967
/trunk/blender/source/darwin/build_files:41227-41228
   + /trunk/blender/build_files:41227-46052
/trunk/blender/source/darwin/build_files:41227-41228

Modified: branches/soc-2011-cucumber/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-cucumber/build_files/buildbot/master.cfg	2012-04-29 00:28:03 UTC (rev 46055)
+++ branches/soc-2011-cucumber/build_files/buildbot/master.cfg	2012-04-29 00:33:24 UTC (rev 46056)
@@ -117,6 +117,8 @@
 add_builder(c, 'win32_scons', 'windows', generic_builder)
 add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad')
 add_builder(c, 'win64_scons', 'win64', generic_builder)
+add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder)
+add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder)
 #add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
 #add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
 

Modified: branches/soc-2011-cucumber/build_files/buildbot/master_unpack.py
===================================================================
--- branches/soc-2011-cucumber/build_files/buildbot/master_unpack.py	2012-04-29 00:28:03 UTC (rev 46055)
+++ branches/soc-2011-cucumber/build_files/buildbot/master_unpack.py	2012-04-29 00:33:24 UTC (rev 46056)
@@ -48,7 +48,8 @@
     tokens = filename.split("-")
     platforms = ('osx', 'mac', 'bsd',
                  'win', 'linux', 'source',
-                 'solaris')
+                 'solaris',
+                 'mingw')
     platform_tokens = []
     found = False
 

Modified: branches/soc-2011-cucumber/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2011-cucumber/build_files/buildbot/slave_compile.py	2012-04-29 00:28:03 UTC (rev 46055)
+++ branches/soc-2011-cucumber/build_files/buildbot/slave_compile.py	2012-04-29 00:33:24 UTC (rev 46056)
@@ -117,6 +117,8 @@
             scons_options.append('BF_BITNESS=' + bitness)
             scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
             scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
+            if builder.find('mingw') != -1:
+                scons_options.append('BF_TOOLSET=mingw')
 
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
         sys.exit(retcode)

Modified: branches/soc-2011-cucumber/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2011-cucumber/build_files/buildbot/slave_pack.py	2012-04-29 00:28:03 UTC (rev 46055)
+++ branches/soc-2011-cucumber/build_files/buildbot/slave_pack.py	2012-04-29 00:33:24 UTC (rev 46056)
@@ -81,6 +81,8 @@
             scons_options.append('BF_BITNESS=' + bitness)
             scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
             scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
+            if builder.find('mingw') != -1:
+                scons_options.append('BF_TOOLSET=mingw')
 
         retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
         sys.exit(retcode)

Modified: branches/soc-2011-cucumber/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-cucumber/build_files/scons/tools/btools.py	2012-04-29 00:28:03 UTC (rev 46055)
+++ branches/soc-2011-cucumber/build_files/scons/tools/btools.py	2012-04-29 00:33:24 UTC (rev 46056)
@@ -622,7 +622,13 @@
     else:
         extension = '.tar.bz2'
 
-    platform = env['OURPLATFORM'].split('-')[0]
+    if env['OURPLATFORM'] == 'win32-mingw':
+        platform = 'mingw32'
+    elif env['OURPLATFORM'] == 'win64-mingw':
+        platform = 'mingw64'
+    else:
+        platform = env['OURPLATFORM'].split('-')[0]
+
     if platform == 'linux':
         import platform
 

Modified: branches/soc-2011-cucumber/doc/manpage/blender.1
===================================================================
(Binary files differ)


Property changes on: branches/soc-2011-cucumber/extern
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/extern:41227-45967
/trunk/blender/source/darwin/extern:41227-41228
   + /trunk/blender/extern:41227-46052
/trunk/blender/source/darwin/extern:41227-41228


@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list