[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46645] branches/meshdata_transfer: svn merge ^/trunk/blender -r46559:HEAD

Ove Murberg Henriksen sorayasilvermoon at hotmail.com
Tue May 15 03:28:19 CEST 2012


Revision: 46645
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46645
Author:   cyborgmuppet
Date:     2012-05-15 01:28:12 +0000 (Tue, 15 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46559:HEAD

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

Modified Paths:
--------------
    branches/meshdata_transfer/CMakeLists.txt
    branches/meshdata_transfer/GNUmakefile
    branches/meshdata_transfer/build_files/scons/config/win32-vc-config.py
    branches/meshdata_transfer/build_files/scons/config/win64-mingw-config.py
    branches/meshdata_transfer/build_files/scons/tools/btools.py
    branches/meshdata_transfer/extern/bullet2/readme.txt
    branches/meshdata_transfer/extern/bullet2/src/LinearMath/btSerializer.h
    branches/meshdata_transfer/intern/audaspace/CMakeLists.txt
    branches/meshdata_transfer/intern/cycles/device/device.h
    branches/meshdata_transfer/intern/cycles/device/device_cpu.cpp
    branches/meshdata_transfer/intern/cycles/device/device_cuda.cpp
    branches/meshdata_transfer/intern/cycles/device/device_multi.cpp
    branches/meshdata_transfer/intern/cycles/device/device_opencl.cpp
    branches/meshdata_transfer/intern/cycles/kernel/kernel_compat_cpu.h
    branches/meshdata_transfer/intern/cycles/kernel/kernel_compat_cuda.h
    branches/meshdata_transfer/intern/cycles/kernel/kernel_light.h
    branches/meshdata_transfer/intern/cycles/kernel/kernel_textures.h
    branches/meshdata_transfer/intern/cycles/kernel/kernel_types.h
    branches/meshdata_transfer/intern/cycles/kernel/svm/svm.h
    branches/meshdata_transfer/intern/cycles/kernel/svm/svm_attribute.h
    branches/meshdata_transfer/intern/cycles/kernel/svm/svm_image.h
    branches/meshdata_transfer/intern/cycles/render/image.cpp
    branches/meshdata_transfer/intern/cycles/render/image.h
    branches/meshdata_transfer/intern/cycles/render/mesh.cpp
    branches/meshdata_transfer/intern/cycles/render/scene.cpp
    branches/meshdata_transfer/intern/cycles/render/scene.h
    branches/meshdata_transfer/intern/cycles/util/util_math.h
    branches/meshdata_transfer/intern/elbeem/CMakeLists.txt
    branches/meshdata_transfer/intern/elbeem/intern/ntl_blenderdumper.cpp
    branches/meshdata_transfer/intern/elbeem/intern/ntl_vector3dim.h
    branches/meshdata_transfer/intern/elbeem/intern/ntl_world.cpp
    branches/meshdata_transfer/intern/elbeem/intern/particletracer.cpp
    branches/meshdata_transfer/intern/elbeem/intern/solver_adap.cpp
    branches/meshdata_transfer/intern/elbeem/intern/solver_init.cpp
    branches/meshdata_transfer/intern/elbeem/intern/solver_main.cpp
    branches/meshdata_transfer/intern/elbeem/intern/solver_relax.h
    branches/meshdata_transfer/intern/elbeem/intern/solver_util.cpp
    branches/meshdata_transfer/release/scripts/startup/bl_operators/object.py
    branches/meshdata_transfer/release/scripts/startup/bl_operators/presets.py
    branches/meshdata_transfer/release/scripts/startup/bl_operators/wm.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_userpref.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d.py
    branches/meshdata_transfer/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/meshdata_transfer/source/blender/avi/AVI_avi.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_action.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_armature.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_blender.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_bmesh.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_bmfont.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_booleanops_mesh.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_brush.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_bullet.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_bvhutils.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_camera.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_ccg.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_cdderivedmesh.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_collision.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_colortools.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_constraint.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_context.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_curve.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_customdata.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_customdata_file.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_deform.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_depsgraph.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_displist.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_dynamicpaint.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_effect.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_fcurve.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_fluidsim.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_global.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_group.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_icons.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_idprop.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_image.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_key.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_lattice.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_library.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_main.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_material.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_mesh.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_modifier.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_movieclip.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_navmesh_conversion.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_nla.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_object.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_ocean.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_packedFile.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_particle.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_plugin_types.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_pointcache.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_report.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_scene.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_screen.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_script.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_sequencer.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_shrinkwrap.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_sketch.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_smoke.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_softbody.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_subsurf.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_texture.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_unit.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_utildefines.h
    branches/meshdata_transfer/source/blender/blenkernel/BKE_writeffmpeg.h
    branches/meshdata_transfer/source/blender/blenkernel/depsgraph_private.h
    branches/meshdata_transfer/source/blender/blenkernel/intern/CCGSubSurf.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/DerivedMesh.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/anim_sys.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/armature.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/constraint.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/curve.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/customdata.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/customdata_file.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/deform.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/depsgraph.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/displist.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/dynamicpaint.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/editderivedmesh.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/icons.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/idcode.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/key.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/lattice.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/mball.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/mesh.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/nla.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/object.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/ocean.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/report.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/sketch.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/suggestions.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/writeavi.c
    branches/meshdata_transfer/source/blender/blenkernel/intern/writeffmpeg.c
    branches/meshdata_transfer/source/blender/blenkernel/nla_private.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_args.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_array.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_bitmap.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_bpath.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_callbacks.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_dlrbTree.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_dynlib.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_dynstr.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_edgehash.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_fileops.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_fileops_types.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_fnmatch.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_ghash.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_graph.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_gsqueue.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_heap.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_jitter.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_kdopbvh.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_kdtree.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_linklist.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_math_base.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_math_color.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_math_geom.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_math_matrix.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_math_rotation.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_math_vector.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_memarena.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_noise.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_path_util.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_rand.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_rect.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_scanfill.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_smallhash.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_string.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_string_utf8.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_threads.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_utildefines.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_vfontdata.h
    branches/meshdata_transfer/source/blender/blenlib/BLI_winstuff.h
    branches/meshdata_transfer/source/blender/blenlib/PIL_time.h
    branches/meshdata_transfer/source/blender/blenlib/intern/BLI_args.c
    branches/meshdata_transfer/source/blender/blenlib/intern/BLI_dynstr.c
    branches/meshdata_transfer/source/blender/blenlib/intern/BLI_ghash.c
    branches/meshdata_transfer/source/blender/blenlib/intern/BLI_heap.c
    branches/meshdata_transfer/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/meshdata_transfer/source/blender/blenlib/intern/BLI_kdtree.c
    branches/meshdata_transfer/source/blender/blenlib/intern/BLI_linklist.c
    branches/meshdata_transfer/source/blender/blenlib/intern/BLI_memarena.c
    branches/meshdata_transfer/source/blender/blenlib/intern/BLI_mempool.c
    branches/meshdata_transfer/source/blender/blenlib/intern/DLRB_tree.c
    branches/meshdata_transfer/source/blender/blenlib/intern/boxpack2d.c
    branches/meshdata_transfer/source/blender/blenlib/intern/bpath.c
    branches/meshdata_transfer/source/blender/blenlib/intern/callbacks.c
    branches/meshdata_transfer/source/blender/blenlib/intern/cpu.c
    branches/meshdata_transfer/source/blender/blenlib/intern/dynlib.c
    branches/meshdata_transfer/source/blender/blenlib/intern/edgehash.c
    branches/meshdata_transfer/source/blender/blenlib/intern/fileops.c
    branches/meshdata_transfer/source/blender/blenlib/intern/freetypefont.c
    branches/meshdata_transfer/source/blender/blenlib/intern/graph.c
    branches/meshdata_transfer/source/blender/blenlib/intern/gsqueue.c
    branches/meshdata_transfer/source/blender/blenlib/intern/jitter.c
    branches/meshdata_transfer/source/blender/blenlib/intern/listbase.c
    branches/meshdata_transfer/source/blender/blenlib/intern/math_geom.c
    branches/meshdata_transfer/source/blender/blenlib/intern/math_rotation.c
    branches/meshdata_transfer/source/blender/blenlib/intern/math_vector_inline.c
    branches/meshdata_transfer/source/blender/blenlib/intern/noise.c
    branches/meshdata_transfer/source/blender/blenlib/intern/path_util.c
    branches/meshdata_transfer/source/blender/blenlib/intern/pbvh.c
    branches/meshdata_transfer/source/blender/blenlib/intern/rand.c
    branches/meshdata_transfer/source/blender/blenlib/intern/rct.c
    branches/meshdata_transfer/source/blender/blenlib/intern/scanfill.c
    branches/meshdata_transfer/source/blender/blenlib/intern/smallhash.c
    branches/meshdata_transfer/source/blender/blenlib/intern/storage.c
    branches/meshdata_transfer/source/blender/blenlib/intern/string.c
    branches/meshdata_transfer/source/blender/blenlib/intern/threads.c
    branches/meshdata_transfer/source/blender/blenlib/intern/time.c
    branches/meshdata_transfer/source/blender/blenlib/intern/uvproject.c
    branches/meshdata_transfer/source/blender/blenlib/intern/voxel.c
    branches/meshdata_transfer/source/blender/blenlib/intern/winstuff.c
    branches/meshdata_transfer/source/blender/blenloader/BLO_readfile.h
    branches/meshdata_transfer/source/blender/blenloader/BLO_sys_types.h
    branches/meshdata_transfer/source/blender/blenloader/intern/readblenentry.c
    branches/meshdata_transfer/source/blender/blenloader/intern/readfile.h
    branches/meshdata_transfer/source/blender/blenloader/intern/undofile.c
    branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_operators.h
    branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_polygon.c
    branches/meshdata_transfer/source/blender/bmesh/operators/bmo_hull.c
    branches/meshdata_transfer/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/meshdata_transfer/source/blender/bmesh/operators/bmo_triangulate.c
    branches/meshdata_transfer/source/blender/bmesh/operators/bmo_utils.c
    branches/meshdata_transfer/source/blender/bmesh/tools/BME_bevel.c
    branches/meshdata_transfer/source/blender/editors/armature/editarmature.c
    branches/meshdata_transfer/source/blender/editors/armature/meshlaplacian.c
    branches/meshdata_transfer/source/blender/editors/curve/editcurve.c
    branches/meshdata_transfer/source/blender/editors/datafiles/startup.blend.c
    branches/meshdata_transfer/source/blender/editors/gpencil/gpencil_paint.c
    branches/meshdata_transfer/source/blender/editors/include/BIF_gl.h
    branches/meshdata_transfer/source/blender/editors/include/BIF_glutil.h
    branches/meshdata_transfer/source/blender/editors/include/ED_anim_api.h
    branches/meshdata_transfer/source/blender/editors/include/ED_armature.h
    branches/meshdata_transfer/source/blender/editors/include/ED_clip.h
    branches/meshdata_transfer/source/blender/editors/include/ED_curve.h
    branches/meshdata_transfer/source/blender/editors/include/ED_fileselect.h
    branches/meshdata_transfer/source/blender/editors/include/ED_fluidsim.h
    branches/meshdata_transfer/source/blender/editors/include/ED_gpencil.h
    branches/meshdata_transfer/source/blender/editors/include/ED_keyframes_draw.h
    branches/meshdata_transfer/source/blender/editors/include/ED_keyframes_edit.h
    branches/meshdata_transfer/source/blender/editors/include/ED_keyframing.h
    branches/meshdata_transfer/source/blender/editors/include/ED_markers.h
    branches/meshdata_transfer/source/blender/editors/include/ED_numinput.h
    branches/meshdata_transfer/source/blender/editors/include/ED_object.h
    branches/meshdata_transfer/source/blender/editors/include/ED_render.h
    branches/meshdata_transfer/source/blender/editors/include/ED_screen.h
    branches/meshdata_transfer/source/blender/editors/include/ED_screen_types.h
    branches/meshdata_transfer/source/blender/editors/include/ED_sculpt.h
    branches/meshdata_transfer/source/blender/editors/include/ED_sequencer.h
    branches/meshdata_transfer/source/blender/editors/include/ED_space_api.h
    branches/meshdata_transfer/source/blender/editors/include/ED_transform.h
    branches/meshdata_transfer/source/blender/editors/include/ED_types.h
    branches/meshdata_transfer/source/blender/editors/include/ED_util.h
    branches/meshdata_transfer/source/blender/editors/include/ED_view3d.h
    branches/meshdata_transfer/source/blender/editors/include/UI_interface.h
    branches/meshdata_transfer/source/blender/editors/include/UI_interface_icons.h
    branches/meshdata_transfer/source/blender/editors/include/UI_resources.h
    branches/meshdata_transfer/source/blender/editors/include/UI_view2d.h
    branches/meshdata_transfer/source/blender/editors/mesh/editface.c
    branches/meshdata_transfer/source/blender/editors/mesh/editmesh_bvh.c
    branches/meshdata_transfer/source/blender/editors/mesh/editmesh_knife.c
    branches/meshdata_transfer/source/blender/editors/mesh/editmesh_select.c
    branches/meshdata_transfer/source/blender/editors/mesh/editmesh_tools.c
    branches/meshdata_transfer/source/blender/editors/mesh/meshtools.c
    branches/meshdata_transfer/source/blender/editors/metaball/mball_edit.c
    branches/meshdata_transfer/source/blender/editors/object/object_transform.c
    branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c
    branches/meshdata_transfer/source/blender/editors/physics/particle_edit.c
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_image.c
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/meshdata_transfer/source/blender/editors/sculpt_paint/sculpt.c
    branches/meshdata_transfer/source/blender/editors/space_api/spacetypes.c
    branches/meshdata_transfer/source/blender/editors/space_clip/clip_editor.c
    branches/meshdata_transfer/source/blender/editors/space_clip/clip_intern.h
    branches/meshdata_transfer/source/blender/editors/space_clip/space_clip.c
    branches/meshdata_transfer/source/blender/editors/space_clip/tracking_ops.c
    branches/meshdata_transfer/source/blender/editors/space_file/fsmenu.c
    branches/meshdata_transfer/source/blender/editors/space_logic/logic_buttons.c
    branches/meshdata_transfer/source/blender/editors/space_node/node_edit.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/drawvolume.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_edit.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_intern.h
    branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_select.c
    branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_snap.c
    branches/meshdata_transfer/source/blender/editors/transform/transform.c
    branches/meshdata_transfer/source/blender/editors/transform/transform.h
    branches/meshdata_transfer/source/blender/editors/transform/transform_conversions.c
    branches/meshdata_transfer/source/blender/editors/transform/transform_generics.c
    branches/meshdata_transfer/source/blender/editors/transform/transform_manipulator.c
    branches/meshdata_transfer/source/blender/editors/transform/transform_ops.c
    branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_ops.c
    branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/meshdata_transfer/source/blender/imbuf/intern/allocimbuf.c
    branches/meshdata_transfer/source/blender/imbuf/intern/divers.c
    branches/meshdata_transfer/source/blender/imbuf/intern/filter.c
    branches/meshdata_transfer/source/blender/imbuf/intern/imageprocess.c
    branches/meshdata_transfer/source/blender/imbuf/intern/rotate.c
    branches/meshdata_transfer/source/blender/imbuf/intern/writeimage.c
    branches/meshdata_transfer/source/blender/makesdna/DNA_ID.h
    branches/meshdata_transfer/source/blender/makesdna/DNA_scene_types.h
    branches/meshdata_transfer/source/blender/makesdna/intern/dna_genfile.c
    branches/meshdata_transfer/source/blender/makesdna/intern/makesdna.c
    branches/meshdata_transfer/source/blender/makesrna/RNA_types.h
    branches/meshdata_transfer/source/blender/makesrna/intern/makesrna.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_ID.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_access.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_action.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_actuator.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_animation.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_animation_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_animviz.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_armature.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_armature_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_boid.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_camera.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_cloth.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_color.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_constraint.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_context.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_controller.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_curve.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_define.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_fcurve.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_fluidsim.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_gpencil.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_group.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_image.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_image_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_key.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_lamp.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_lattice.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_main.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_main_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_material.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_mesh.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_mesh_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_meta.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_modifier.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_movieclip.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_nla.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_object.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_object_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_object_force.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_packedfile.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_particle.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_pose.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_pose_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_property.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_render.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_rna.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_scene_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_screen.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_sensor.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_sequencer.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_sequencer_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_smoke.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_sound.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_space.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_text.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_text_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_texture.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_texture_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_timeline.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_tracking.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_ui.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_ui_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_userdef.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_wm.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_wm_api.c
    branches/meshdata_transfer/source/blender/makesrna/intern/rna_world.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_cast.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_solidify.c
    branches/meshdata_transfer/source/blender/modifiers/intern/MOD_util.c
    branches/meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_squeeze.c
    branches/meshdata_transfer/source/blender/quicktime/apple/quicktime_export.c
    branches/meshdata_transfer/source/blender/quicktime/apple/quicktime_import.c
    branches/meshdata_transfer/source/blender/render/intern/include/strand.h
    branches/meshdata_transfer/source/blender/render/intern/raytrace/bvh.h
    branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
    branches/meshdata_transfer/source/blender/render/intern/raytrace/svbvh.h
    branches/meshdata_transfer/source/blender/render/intern/source/convertblender.c
    branches/meshdata_transfer/source/blender/render/intern/source/occlusion.c
    branches/meshdata_transfer/source/blender/render/intern/source/rayshade.c
    branches/meshdata_transfer/source/blender/render/intern/source/sss.c
    branches/meshdata_transfer/source/blender/render/intern/source/strand.c
    branches/meshdata_transfer/source/blender/render/intern/source/sunsky.c
    branches/meshdata_transfer/source/blender/render/intern/source/volume_precache.c
    branches/meshdata_transfer/source/blender/render/intern/source/zbuf.c
    branches/meshdata_transfer/source/blender/windowmanager/WM_api.h
    branches/meshdata_transfer/source/blender/windowmanager/intern/wm_gesture.c
    branches/meshdata_transfer/source/blender/windowmanager/intern/wm_operators.c
    branches/meshdata_transfer/source/blender/windowmanager/wm_cursors.h
    branches/meshdata_transfer/source/creator/buildinfo.c
    branches/meshdata_transfer/source/creator/creator.c
    branches/meshdata_transfer/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/meshdata_transfer/source/gameengine/VideoTexture/CMakeLists.txt
    branches/meshdata_transfer/source/tools/GL/core.gl
    branches/meshdata_transfer/source/tools/GL/extensions.gl
    branches/meshdata_transfer/source/tools/GL/glreport.py
    branches/meshdata_transfer/source/tools/check_style_c.py

Added Paths:
-----------
    branches/meshdata_transfer/extern/bullet2/patches/
    branches/meshdata_transfer/extern/bullet2/patches/make_id.patch
    branches/meshdata_transfer/intern/elbeem/intern/globals.h
    branches/meshdata_transfer/source/tools/GL/agl.gl
    branches/meshdata_transfer/source/tools/GL/cgl.gl
    branches/meshdata_transfer/source/tools/GL/deprecated.gl
    branches/meshdata_transfer/source/tools/GL/egl.gl
    branches/meshdata_transfer/source/tools/GL/glX.gl
    branches/meshdata_transfer/source/tools/GL/libraries.gl
    branches/meshdata_transfer/source/tools/GL/wgl.gl

Removed Paths:
-------------
    branches/meshdata_transfer/extern/bullet2/patches/make_id.patch
    branches/meshdata_transfer/source/tools/GL/system.gl

Property Changed:
----------------
    branches/meshdata_transfer/
    branches/meshdata_transfer/source/blender/editors/interface/interface.c
    branches/meshdata_transfer/source/blender/editors/space_outliner/


Property changes on: branches/meshdata_transfer
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46559
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46644

Modified: branches/meshdata_transfer/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/CMakeLists.txt	2012-05-14 23:36:07 UTC (rev 46644)
+++ branches/meshdata_transfer/CMakeLists.txt	2012-05-15 01:28:12 UTC (rev 46645)
@@ -370,10 +370,6 @@
 		                    "because it is currently unsupported, remove this "
 		                    "line if youre a developer who wants to add support.")
 	endif()
-	
-	if((WITH_MINGW64) AND (WITH_OPENCOLLADA))
-		message(FATAL_ERROR "MINGW64 still doesn't support: WITH_OPENCOLLADA/WITH_CODEC_FFMPEG")
-	endif()
 endif()
 
 TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
@@ -1015,8 +1011,10 @@
 		set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
 
 		if(WITH_MINGW64)
-			#Yes, the point for MinGW64 is moar optimization by default :)
-			set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2 -ftree-vectorize")
+			#We need to take care though not to have these on debug builds because they may play funky with gdb
+			if(CMAKE_BUILD_TYPE MATCHES "Release")
+				set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -ftree-vectorize")
+			endif()
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
 			set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
 			
@@ -1081,7 +1079,7 @@
 				${LIBDIR}/opencollada/include/GeneratedSaxParser/include
 			)
 			set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib ${OPENCOLLADA}/lib)
-			set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver expat pcre buffer ftoa)
+			set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre buffer ftoa xml)
 			set(PCRE_LIBRARIES pcre)
 		endif()
 

Modified: branches/meshdata_transfer/GNUmakefile
===================================================================
--- branches/meshdata_transfer/GNUmakefile	2012-05-14 23:36:07 UTC (rev 46644)
+++ branches/meshdata_transfer/GNUmakefile	2012-05-15 01:28:12 UTC (rev 46645)
@@ -216,7 +216,7 @@
 
 test_style:
 	# run our own checks on C/C++ style
-	PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator
+	PYTHONIOENCODING=utf_8 python3.2 $(BLENDER_DIR)/source/tools/check_style_c.py $(BLENDER_DIR)/source/blender $(BLENDER_DIR)/source/creator --no-length-check
 
 # -----------------------------------------------------------------------------
 # Project Files

Modified: branches/meshdata_transfer/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/meshdata_transfer/build_files/scons/config/win32-vc-config.py	2012-05-14 23:36:07 UTC (rev 46644)
+++ branches/meshdata_transfer/build_files/scons/config/win32-vc-config.py	2012-05-15 01:28:12 UTC (rev 46645)
@@ -165,7 +165,7 @@
 #CUDA
 WITH_BF_CYCLES_CUDA_BINARIES = False
 #BF_CYCLES_CUDA_NVCC = "" # Path to the nvidia compiler
-BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_13', 'sm_20', 'sm_21']
+BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21'] # don't build sm_13 until the compile can fit in 32bit process again :)
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True

Modified: branches/meshdata_transfer/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/meshdata_transfer/build_files/scons/config/win64-mingw-config.py	2012-05-14 23:36:07 UTC (rev 46644)
+++ branches/meshdata_transfer/build_files/scons/config/win64-mingw-config.py	2012-05-15 01:28:12 UTC (rev 46645)
@@ -167,9 +167,10 @@
 
 #Ray trace optimization
 WITH_BF_RAYOPTIMIZATION = True
-BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2', '-ftree-vectorize']
+BF_RAYOPTIMIZATION_SSE_FLAGS = ['-mmmx', '-msse', '-msse2']
 
-WITH_BF_OPENMP = True
+#Produces errors while rendering with subsurf/multires,
+WITH_BF_OPENMP = False
 
 ##
 CC = 'gcc'
@@ -178,10 +179,10 @@
 CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
 CXXFLAGS = [ '-fpermissive' ]
 
-CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC', '-D_SSIZE_T_']
+CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC']
 REL_CFLAGS = []
 REL_CXXFLAGS = []
-REL_CCFLAGS = ['-DNDEBUG', '-O2', '-ftree-vectorize', '-mmmx', '-msse', '-msse2']
+REL_CCFLAGS = ['-DNDEBUG', '-O2', '-ftree-vectorize']
 
 C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement', '-Wstrict-prototypes']
 

Modified: branches/meshdata_transfer/build_files/scons/tools/btools.py
===================================================================
--- branches/meshdata_transfer/build_files/scons/tools/btools.py	2012-05-14 23:36:07 UTC (rev 46644)
+++ branches/meshdata_transfer/build_files/scons/tools/btools.py	2012-05-15 01:28:12 UTC (rev 46645)
@@ -177,6 +177,7 @@
             'BF_DEBUG_CFLAGS', 'BF_DEBUG_CCFLAGS', 'BF_DEBUG_CXXFLAGS',
             'C_WARN', 'CC_WARN', 'CXX_WARN',
             'LLIBS', 'PLATFORM_LINKFLAGS','MACOSX_ARCHITECTURE', 'MACOSX_SDK_CHECK', 'XCODE_CUR_VER',
+            'BF_CYCLES_CUDA_BINARIES_ARCH',
     ]
     
     

Deleted: branches/meshdata_transfer/extern/bullet2/patches/make_id.patch
===================================================================
--- trunk/blender/extern/bullet2/patches/make_id.patch	2012-05-14 23:36:07 UTC (rev 46644)
+++ branches/meshdata_transfer/extern/bullet2/patches/make_id.patch	2012-05-15 01:28:12 UTC (rev 46645)
@@ -1,42 +0,0 @@
-Index: src/LinearMath/btSerializer.h
-===================================================================
---- src/LinearMath/btSerializer.h	(revision 46625)
-+++ src/LinearMath/btSerializer.h	(working copy)
-@@ -106,23 +106,23 @@
- 
- #define BT_HEADER_LENGTH 12
- #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__)
--#	define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
-+#	define BT_MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
- #else
--#	define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
-+#	define BT_MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
- #endif
- 
--#define BT_SOFTBODY_CODE		MAKE_ID('S','B','D','Y')
--#define BT_COLLISIONOBJECT_CODE MAKE_ID('C','O','B','J')
--#define BT_RIGIDBODY_CODE		MAKE_ID('R','B','D','Y')
--#define BT_CONSTRAINT_CODE		MAKE_ID('C','O','N','S')
--#define BT_BOXSHAPE_CODE		MAKE_ID('B','O','X','S')
--#define BT_QUANTIZED_BVH_CODE	MAKE_ID('Q','B','V','H')
--#define BT_TRIANLGE_INFO_MAP	MAKE_ID('T','M','A','P')
--#define BT_SHAPE_CODE			MAKE_ID('S','H','A','P')
--#define BT_ARRAY_CODE			MAKE_ID('A','R','A','Y')
--#define BT_SBMATERIAL_CODE		MAKE_ID('S','B','M','T')
--#define BT_SBNODE_CODE			MAKE_ID('S','B','N','D')
--#define BT_DNA_CODE				MAKE_ID('D','N','A','1')
-+#define BT_SOFTBODY_CODE		BT_MAKE_ID('S','B','D','Y')
-+#define BT_COLLISIONOBJECT_CODE BT_MAKE_ID('C','O','B','J')
-+#define BT_RIGIDBODY_CODE		BT_MAKE_ID('R','B','D','Y')
-+#define BT_CONSTRAINT_CODE		BT_MAKE_ID('C','O','N','S')
-+#define BT_BOXSHAPE_CODE		BT_MAKE_ID('B','O','X','S')
-+#define BT_QUANTIZED_BVH_CODE	BT_MAKE_ID('Q','B','V','H')
-+#define BT_TRIANLGE_INFO_MAP	BT_MAKE_ID('T','M','A','P')
-+#define BT_SHAPE_CODE			BT_MAKE_ID('S','H','A','P')
-+#define BT_ARRAY_CODE			BT_MAKE_ID('A','R','A','Y')
-+#define BT_SBMATERIAL_CODE		BT_MAKE_ID('S','B','M','T')
-+#define BT_SBNODE_CODE			BT_MAKE_ID('S','B','N','D')
-+#define BT_DNA_CODE				BT_MAKE_ID('D','N','A','1')
- 
- 
- struct	btPointerUid

Copied: branches/meshdata_transfer/extern/bullet2/patches/make_id.patch (from rev 46644, trunk/blender/extern/bullet2/patches/make_id.patch)
===================================================================
--- branches/meshdata_transfer/extern/bullet2/patches/make_id.patch	                        (rev 0)
+++ branches/meshdata_transfer/extern/bullet2/patches/make_id.patch	2012-05-15 01:28:12 UTC (rev 46645)
@@ -0,0 +1,42 @@
+Index: src/LinearMath/btSerializer.h
+===================================================================
+--- src/LinearMath/btSerializer.h	(revision 46625)
++++ src/LinearMath/btSerializer.h	(working copy)
+@@ -106,23 +106,23 @@
+ 
+ #define BT_HEADER_LENGTH 12
+ #if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__)
+-#	define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
++#	define BT_MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
+ #else
+-#	define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list