[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46369] branches/meshdata_transfer: svn merge ^/trunk/blender -r46000:46100
Ove Murberg Henriksen
sorayasilvermoon at hotmail.com
Mon May 7 00:19:15 CEST 2012
Revision: 46369
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46369
Author: cyborgmuppet
Date: 2012-05-06 22:19:13 +0000 (Sun, 06 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46000:46100
some conflicts. had to backup my code, accept with "tc" and introduce my own code again.
Hope I didnt leave anything out.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46000
Modified Paths:
--------------
branches/meshdata_transfer/CMakeLists.txt
branches/meshdata_transfer/build_files/buildbot/master.cfg
branches/meshdata_transfer/build_files/buildbot/master_unpack.py
branches/meshdata_transfer/build_files/buildbot/slave_compile.py
branches/meshdata_transfer/build_files/buildbot/slave_pack.py
branches/meshdata_transfer/build_files/scons/tools/btools.py
branches/meshdata_transfer/extern/libmv/CMakeLists.txt
branches/meshdata_transfer/extern/libmv/ChangeLog
branches/meshdata_transfer/extern/libmv/files.txt
branches/meshdata_transfer/extern/libmv/libmv-capi.cpp
branches/meshdata_transfer/extern/libmv/libmv-capi.h
branches/meshdata_transfer/intern/audaspace/intern/AUD_C-API.cpp
branches/meshdata_transfer/intern/audaspace/intern/AUD_C-API.h
branches/meshdata_transfer/intern/audaspace/intern/AUD_FileWriter.cpp
branches/meshdata_transfer/intern/audaspace/intern/AUD_FileWriter.h
branches/meshdata_transfer/intern/audaspace/intern/AUD_Reference.h
branches/meshdata_transfer/intern/audaspace/intern/AUD_ReferenceHandler.cpp
branches/meshdata_transfer/intern/container/CTR_Map.h
branches/meshdata_transfer/intern/cycles/blender/addon/properties.py
branches/meshdata_transfer/intern/cycles/blender/addon/ui.py
branches/meshdata_transfer/intern/cycles/blender/blender_session.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_sync.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_sync.h
branches/meshdata_transfer/intern/cycles/bvh/CMakeLists.txt
branches/meshdata_transfer/intern/cycles/bvh/bvh.cpp
branches/meshdata_transfer/intern/cycles/bvh/bvh_build.cpp
branches/meshdata_transfer/intern/cycles/bvh/bvh_build.h
branches/meshdata_transfer/intern/cycles/bvh/bvh_node.cpp
branches/meshdata_transfer/intern/cycles/bvh/bvh_node.h
branches/meshdata_transfer/intern/cycles/bvh/bvh_params.h
branches/meshdata_transfer/intern/cycles/bvh/bvh_sort.cpp
branches/meshdata_transfer/intern/cycles/bvh/bvh_sort.h
branches/meshdata_transfer/intern/cycles/device/device.cpp
branches/meshdata_transfer/intern/cycles/device/device.h
branches/meshdata_transfer/intern/cycles/device/device_cpu.cpp
branches/meshdata_transfer/intern/cycles/device/device_multi.cpp
branches/meshdata_transfer/intern/cycles/kernel/kernel_accumulate.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_path.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_types.h
branches/meshdata_transfer/intern/cycles/kernel/svm/svm_tex_coord.h
branches/meshdata_transfer/intern/cycles/kernel/svm/svm_types.h
branches/meshdata_transfer/intern/cycles/render/integrator.cpp
branches/meshdata_transfer/intern/cycles/render/integrator.h
branches/meshdata_transfer/intern/cycles/render/mesh.cpp
branches/meshdata_transfer/intern/cycles/render/nodes.cpp
branches/meshdata_transfer/intern/cycles/render/object.cpp
branches/meshdata_transfer/intern/cycles/render/session.cpp
branches/meshdata_transfer/intern/cycles/subd/subd_patch.cpp
branches/meshdata_transfer/intern/cycles/util/CMakeLists.txt
branches/meshdata_transfer/intern/cycles/util/util_boundbox.h
branches/meshdata_transfer/intern/cycles/util/util_math.h
branches/meshdata_transfer/intern/cycles/util/util_thread.h
branches/meshdata_transfer/intern/cycles/util/util_transform.cpp
branches/meshdata_transfer/intern/cycles/util/util_types.h
branches/meshdata_transfer/intern/ghost/GHOST_Rect.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/meshdata_transfer/intern/guardedalloc/intern/mallocn.c
branches/meshdata_transfer/intern/mikktspace/mikktspace.c
branches/meshdata_transfer/intern/smoke/extern/smoke_API.h
branches/meshdata_transfer/intern/smoke/intern/FLUID_3D.cpp
branches/meshdata_transfer/intern/smoke/intern/FLUID_3D.h
branches/meshdata_transfer/intern/smoke/intern/OBSTACLE.h
branches/meshdata_transfer/intern/smoke/intern/WTURBULENCE.cpp
branches/meshdata_transfer/intern/smoke/intern/smoke_API.cpp
branches/meshdata_transfer/intern/utfconv/utf_winfunc.c
branches/meshdata_transfer/release/plugins/sequence/blur.c
branches/meshdata_transfer/release/plugins/texture/clouds2.c
branches/meshdata_transfer/release/plugins/texture/tiles.c
branches/meshdata_transfer/release/scripts/modules/addon_utils.py
branches/meshdata_transfer/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_paint_common.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_physics_common.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_clip.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_sequencer.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/space_text.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/release/scripts/templates/operator_modal_timer.py
branches/meshdata_transfer/source/blender/avi/AVI_avi.h
branches/meshdata_transfer/source/blender/avi/intern/avi.c
branches/meshdata_transfer/source/blender/avi/intern/avirgb.c
branches/meshdata_transfer/source/blender/avi/intern/codecs.c
branches/meshdata_transfer/source/blender/avi/intern/endian.c
branches/meshdata_transfer/source/blender/avi/intern/options.c
branches/meshdata_transfer/source/blender/blenfont/intern/blf_glyph.c
branches/meshdata_transfer/source/blender/blenfont/intern/blf_lang.c
branches/meshdata_transfer/source/blender/blenkernel/BKE_blender.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_brush.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_cloth.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_curve.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_deform.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_font.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_mball.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_mesh.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_movieclip.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_node.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_ocean.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_softbody.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_text.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/action.c
branches/meshdata_transfer/source/blender/blenkernel/intern/anim.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/blender.c
branches/meshdata_transfer/source/blender/blenkernel/intern/bmfont.c
branches/meshdata_transfer/source/blender/blenkernel/intern/boids.c
branches/meshdata_transfer/source/blender/blenkernel/intern/brush.c
branches/meshdata_transfer/source/blender/blenkernel/intern/bvhutils.c
branches/meshdata_transfer/source/blender/blenkernel/intern/camera.c
branches/meshdata_transfer/source/blender/blenkernel/intern/cdderivedmesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/cloth.c
branches/meshdata_transfer/source/blender/blenkernel/intern/collision.c
branches/meshdata_transfer/source/blender/blenkernel/intern/colortools.c
branches/meshdata_transfer/source/blender/blenkernel/intern/constraint.c
branches/meshdata_transfer/source/blender/blenkernel/intern/context.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/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/effect.c
branches/meshdata_transfer/source/blender/blenkernel/intern/fcurve.c
branches/meshdata_transfer/source/blender/blenkernel/intern/fluidsim.c
branches/meshdata_transfer/source/blender/blenkernel/intern/fmodifier.c
branches/meshdata_transfer/source/blender/blenkernel/intern/font.c
branches/meshdata_transfer/source/blender/blenkernel/intern/gpencil.c
branches/meshdata_transfer/source/blender/blenkernel/intern/group.c
branches/meshdata_transfer/source/blender/blenkernel/intern/idcode.c
branches/meshdata_transfer/source/blender/blenkernel/intern/idprop.c
branches/meshdata_transfer/source/blender/blenkernel/intern/image.c
branches/meshdata_transfer/source/blender/blenkernel/intern/image_gen.c
branches/meshdata_transfer/source/blender/blenkernel/intern/implicit.c
branches/meshdata_transfer/source/blender/blenkernel/intern/ipo.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/library.c
branches/meshdata_transfer/source/blender/blenkernel/intern/material.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/modifier.c
branches/meshdata_transfer/source/blender/blenkernel/intern/modifiers_bmesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/movieclip.c
branches/meshdata_transfer/source/blender/blenkernel/intern/multires.c
branches/meshdata_transfer/source/blender/blenkernel/intern/navmesh_conversion.c
branches/meshdata_transfer/source/blender/blenkernel/intern/nla.c
branches/meshdata_transfer/source/blender/blenkernel/intern/node.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/packedFile.c
branches/meshdata_transfer/source/blender/blenkernel/intern/paint.c
branches/meshdata_transfer/source/blender/blenkernel/intern/particle.c
branches/meshdata_transfer/source/blender/blenkernel/intern/particle_system.c
branches/meshdata_transfer/source/blender/blenkernel/intern/pointcache.c
branches/meshdata_transfer/source/blender/blenkernel/intern/property.c
branches/meshdata_transfer/source/blender/blenkernel/intern/report.c
branches/meshdata_transfer/source/blender/blenkernel/intern/sca.c
branches/meshdata_transfer/source/blender/blenkernel/intern/scene.c
branches/meshdata_transfer/source/blender/blenkernel/intern/seqeffects.c
branches/meshdata_transfer/source/blender/blenkernel/intern/sequencer.c
branches/meshdata_transfer/source/blender/blenkernel/intern/shrinkwrap.c
branches/meshdata_transfer/source/blender/blenkernel/intern/sketch.c
branches/meshdata_transfer/source/blender/blenkernel/intern/smoke.c
branches/meshdata_transfer/source/blender/blenkernel/intern/softbody.c
branches/meshdata_transfer/source/blender/blenkernel/intern/sound.c
branches/meshdata_transfer/source/blender/blenkernel/intern/subsurf_ccg.c
branches/meshdata_transfer/source/blender/blenkernel/intern/text.c
branches/meshdata_transfer/source/blender/blenkernel/intern/texture.c
branches/meshdata_transfer/source/blender/blenkernel/intern/tracking.c
branches/meshdata_transfer/source/blender/blenkernel/intern/unit.c
branches/meshdata_transfer/source/blender/blenkernel/intern/writeffmpeg.c
branches/meshdata_transfer/source/blender/blenkernel/intern/writeframeserver.c
branches/meshdata_transfer/source/blender/blenlib/BLI_array.h
branches/meshdata_transfer/source/blender/blenlib/BLI_fileops_types.h
branches/meshdata_transfer/source/blender/blenlib/BLI_ghash.h
branches/meshdata_transfer/source/blender/blenlib/BLI_math_geom.h
branches/meshdata_transfer/source/blender/blenlib/BLI_math_vector.h
branches/meshdata_transfer/source/blender/blenlib/BLI_path_util.h
branches/meshdata_transfer/source/blender/blenlib/BLI_utildefines.h
branches/meshdata_transfer/source/blender/blenlib/CMakeLists.txt
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/DLRB_tree.c
branches/meshdata_transfer/source/blender/blenlib/intern/bpath.c
branches/meshdata_transfer/source/blender/blenlib/intern/dynlib.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/jitter.c
branches/meshdata_transfer/source/blender/blenlib/intern/listbase.c
branches/meshdata_transfer/source/blender/blenlib/intern/math_matrix.c
branches/meshdata_transfer/source/blender/blenlib/intern/math_rotation.c
branches/meshdata_transfer/source/blender/blenlib/intern/math_vector.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/storage.c
branches/meshdata_transfer/source/blender/blenlib/intern/string.c
branches/meshdata_transfer/source/blender/blenlib/intern/string_utf8.c
branches/meshdata_transfer/source/blender/blenlib/intern/threads.c
branches/meshdata_transfer/source/blender/blenlib/intern/winstuff.c
branches/meshdata_transfer/source/blender/blenloader/intern/readblenentry.c
branches/meshdata_transfer/source/blender/blenloader/intern/readfile.c
branches/meshdata_transfer/source/blender/blenloader/intern/writefile.c
branches/meshdata_transfer/source/blender/blenpluginapi/iff.h
branches/meshdata_transfer/source/blender/blenpluginapi/intern/pluginapi.c
branches/meshdata_transfer/source/blender/bmesh/CMakeLists.txt
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_construct.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_core.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_error.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_iterators.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_iterators.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_mods.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_opdefines.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_operators_private.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_queries.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_queries.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_walkers.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_bevel.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_connect.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_create.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_dupe.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_extrude.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_inset.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_join_triangles.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_mirror.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_removedoubles.c
branches/meshdata_transfer/source/blender/bmesh/operators/bmo_subdivide.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/collada/AnimationExporter.cpp
branches/meshdata_transfer/source/blender/collada/AnimationExporter.h
branches/meshdata_transfer/source/blender/collada/AnimationImporter.cpp
branches/meshdata_transfer/source/blender/collada/AnimationImporter.h
branches/meshdata_transfer/source/blender/collada/ArmatureExporter.cpp
branches/meshdata_transfer/source/blender/collada/ArmatureImporter.cpp
branches/meshdata_transfer/source/blender/collada/ArmatureImporter.h
branches/meshdata_transfer/source/blender/collada/CameraExporter.cpp
branches/meshdata_transfer/source/blender/collada/DocumentExporter.cpp
branches/meshdata_transfer/source/blender/collada/DocumentImporter.cpp
branches/meshdata_transfer/source/blender/collada/EffectExporter.cpp
branches/meshdata_transfer/source/blender/collada/ErrorHandler.cpp
branches/meshdata_transfer/source/blender/collada/ErrorHandler.h
branches/meshdata_transfer/source/blender/collada/ExtraHandler.h
branches/meshdata_transfer/source/blender/collada/ExtraTags.h
branches/meshdata_transfer/source/blender/collada/GeometryExporter.cpp
branches/meshdata_transfer/source/blender/collada/GeometryExporter.h
branches/meshdata_transfer/source/blender/collada/ImageExporter.cpp
branches/meshdata_transfer/source/blender/collada/LightExporter.cpp
branches/meshdata_transfer/source/blender/collada/MaterialExporter.cpp
branches/meshdata_transfer/source/blender/collada/MaterialExporter.h
branches/meshdata_transfer/source/blender/collada/MeshImporter.cpp
branches/meshdata_transfer/source/blender/collada/SceneExporter.cpp
branches/meshdata_transfer/source/blender/collada/TransformReader.cpp
branches/meshdata_transfer/source/blender/collada/TransformWriter.cpp
branches/meshdata_transfer/source/blender/collada/collada_internal.cpp
branches/meshdata_transfer/source/blender/editors/animation/anim_channels_defines.c
branches/meshdata_transfer/source/blender/editors/animation/anim_channels_edit.c
branches/meshdata_transfer/source/blender/editors/animation/anim_deps.c
branches/meshdata_transfer/source/blender/editors/animation/anim_draw.c
branches/meshdata_transfer/source/blender/editors/animation/anim_filter.c
branches/meshdata_transfer/source/blender/editors/animation/anim_ipo_utils.c
branches/meshdata_transfer/source/blender/editors/animation/anim_markers.c
branches/meshdata_transfer/source/blender/editors/animation/drivers.c
branches/meshdata_transfer/source/blender/editors/animation/fmodifier_ui.c
branches/meshdata_transfer/source/blender/editors/animation/keyframes_draw.c
branches/meshdata_transfer/source/blender/editors/animation/keyframes_general.c
branches/meshdata_transfer/source/blender/editors/animation/keyframing.c
branches/meshdata_transfer/source/blender/editors/animation/keyingsets.c
branches/meshdata_transfer/source/blender/editors/armature/armature_intern.h
branches/meshdata_transfer/source/blender/editors/armature/armature_ops.c
branches/meshdata_transfer/source/blender/editors/armature/editarmature.c
branches/meshdata_transfer/source/blender/editors/armature/editarmature_generate.c
branches/meshdata_transfer/source/blender/editors/armature/editarmature_retarget.c
branches/meshdata_transfer/source/blender/editors/armature/editarmature_sketch.c
branches/meshdata_transfer/source/blender/editors/armature/meshlaplacian.c
branches/meshdata_transfer/source/blender/editors/armature/poseSlide.c
branches/meshdata_transfer/source/blender/editors/armature/poseUtils.c
branches/meshdata_transfer/source/blender/editors/armature/poselib.c
branches/meshdata_transfer/source/blender/editors/armature/poseobject.c
branches/meshdata_transfer/source/blender/editors/armature/reeb.c
branches/meshdata_transfer/source/blender/editors/curve/editcurve.c
branches/meshdata_transfer/source/blender/editors/curve/editfont.c
branches/meshdata_transfer/source/blender/editors/gpencil/drawgpencil.c
branches/meshdata_transfer/source/blender/editors/gpencil/editaction_gpencil.c
branches/meshdata_transfer/source/blender/editors/gpencil/gpencil_edit.c
branches/meshdata_transfer/source/blender/editors/gpencil/gpencil_ops.c
branches/meshdata_transfer/source/blender/editors/gpencil/gpencil_paint.c
branches/meshdata_transfer/source/blender/editors/include/ED_anim_api.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_mesh.h
branches/meshdata_transfer/source/blender/editors/include/ED_screen.h
branches/meshdata_transfer/source/blender/editors/include/ED_uvedit.h
branches/meshdata_transfer/source/blender/editors/include/ED_view3d.h
branches/meshdata_transfer/source/blender/editors/interface/interface.c
branches/meshdata_transfer/source/blender/editors/interface/interface_handlers.c
branches/meshdata_transfer/source/blender/editors/interface/interface_layout.c
branches/meshdata_transfer/source/blender/editors/interface/interface_templates.c
branches/meshdata_transfer/source/blender/editors/interface/interface_utils.c
branches/meshdata_transfer/source/blender/editors/interface/interface_widgets.c
branches/meshdata_transfer/source/blender/editors/interface/resources.c
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_bvh.h
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_knife.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_loopcut.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_rip.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_select.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_slide.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_tools.c
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_utils.c
branches/meshdata_transfer/source/blender/editors/mesh/mesh_intern.h
branches/meshdata_transfer/source/blender/editors/mesh/mesh_navmesh.c
branches/meshdata_transfer/source/blender/editors/mesh/mesh_ops.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_add.c
branches/meshdata_transfer/source/blender/editors/object/object_bake.c
branches/meshdata_transfer/source/blender/editors/object/object_constraint.c
branches/meshdata_transfer/source/blender/editors/object/object_edit.c
branches/meshdata_transfer/source/blender/editors/object/object_group.c
branches/meshdata_transfer/source/blender/editors/object/object_hook.c
branches/meshdata_transfer/source/blender/editors/object/object_intern.h
branches/meshdata_transfer/source/blender/editors/object/object_lattice.c
branches/meshdata_transfer/source/blender/editors/object/object_modifier.c
branches/meshdata_transfer/source/blender/editors/object/object_ops.c
branches/meshdata_transfer/source/blender/editors/object/object_relations.c
branches/meshdata_transfer/source/blender/editors/object/object_select.c
branches/meshdata_transfer/source/blender/editors/object/object_shapekey.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/dynamicpaint_ops.c
branches/meshdata_transfer/source/blender/editors/physics/particle_edit.c
branches/meshdata_transfer/source/blender/editors/physics/particle_object.c
branches/meshdata_transfer/source/blender/editors/physics/physics_fluid.c
branches/meshdata_transfer/source/blender/editors/render/render_opengl.c
branches/meshdata_transfer/source/blender/editors/render/render_shading.c
branches/meshdata_transfer/source/blender/editors/screen/area.c
branches/meshdata_transfer/source/blender/editors/screen/glutil.c
branches/meshdata_transfer/source/blender/editors/screen/screen_edit.c
branches/meshdata_transfer/source/blender/editors/screen/screen_ops.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_cursor.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_image.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_ops.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_stroke.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/sculpt_paint/sculpt_undo.c
branches/meshdata_transfer/source/blender/editors/sound/sound_ops.c
branches/meshdata_transfer/source/blender/editors/space_action/action_edit.c
branches/meshdata_transfer/source/blender/editors/space_action/action_select.c
branches/meshdata_transfer/source/blender/editors/space_action/space_action.c
branches/meshdata_transfer/source/blender/editors/space_buttons/buttons_context.c
branches/meshdata_transfer/source/blender/editors/space_buttons/buttons_header.c
branches/meshdata_transfer/source/blender/editors/space_buttons/space_buttons.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_buttons.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_draw.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_editor.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_graph_draw.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_graph_ops.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_intern.h
branches/meshdata_transfer/source/blender/editors/space_clip/clip_ops.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_toolbar.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_utils.c
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/file_draw.c
branches/meshdata_transfer/source/blender/editors/space_file/file_intern.h
branches/meshdata_transfer/source/blender/editors/space_file/file_ops.c
branches/meshdata_transfer/source/blender/editors/space_file/file_panels.c
branches/meshdata_transfer/source/blender/editors/space_file/filelist.c
branches/meshdata_transfer/source/blender/editors/space_file/filesel.c
branches/meshdata_transfer/source/blender/editors/space_file/fsmenu.c
branches/meshdata_transfer/source/blender/editors/space_file/space_file.c
branches/meshdata_transfer/source/blender/editors/space_graph/graph_buttons.c
branches/meshdata_transfer/source/blender/editors/space_graph/graph_draw.c
branches/meshdata_transfer/source/blender/editors/space_graph/graph_edit.c
branches/meshdata_transfer/source/blender/editors/space_graph/graph_select.c
branches/meshdata_transfer/source/blender/editors/space_graph/graph_utils.c
branches/meshdata_transfer/source/blender/editors/space_graph/space_graph.c
branches/meshdata_transfer/source/blender/editors/space_image/image_draw.c
branches/meshdata_transfer/source/blender/editors/space_image/image_ops.c
branches/meshdata_transfer/source/blender/editors/space_image/space_image.c
branches/meshdata_transfer/source/blender/editors/space_info/info_stats.c
branches/meshdata_transfer/source/blender/editors/space_logic/logic_buttons.c
branches/meshdata_transfer/source/blender/editors/space_logic/logic_ops.c
branches/meshdata_transfer/source/blender/editors/space_logic/logic_window.c
branches/meshdata_transfer/source/blender/editors/space_logic/space_logic.c
branches/meshdata_transfer/source/blender/editors/space_nla/nla_buttons.c
branches/meshdata_transfer/source/blender/editors/space_nla/nla_channels.c
branches/meshdata_transfer/source/blender/editors/space_nla/nla_draw.c
branches/meshdata_transfer/source/blender/editors/space_nla/nla_edit.c
branches/meshdata_transfer/source/blender/editors/space_nla/nla_ops.c
branches/meshdata_transfer/source/blender/editors/space_nla/nla_select.c
branches/meshdata_transfer/source/blender/editors/space_nla/space_nla.c
branches/meshdata_transfer/source/blender/editors/space_node/drawnode.c
branches/meshdata_transfer/source/blender/editors/space_node/node_draw.c
branches/meshdata_transfer/source/blender/editors/space_node/node_edit.c
branches/meshdata_transfer/source/blender/editors/space_node/node_select.c
branches/meshdata_transfer/source/blender/editors/space_node/node_templates.c
branches/meshdata_transfer/source/blender/editors/space_node/space_node.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_draw.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_edit.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_select.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_tools.c
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_tree.c
branches/meshdata_transfer/source/blender/editors/space_outliner/space_outliner.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_add.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_draw.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_edit.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_intern.h
branches/meshdata_transfer/source/blender/editors/space_sequencer/sequencer_select.c
branches/meshdata_transfer/source/blender/editors/space_sequencer/space_sequencer.c
branches/meshdata_transfer/source/blender/editors/space_text/space_text.c
branches/meshdata_transfer/source/blender/editors/space_text/text_draw.c
branches/meshdata_transfer/source/blender/editors/space_text/text_intern.h
branches/meshdata_transfer/source/blender/editors/space_text/text_ops.c
branches/meshdata_transfer/source/blender/editors/space_text/text_python.c
branches/meshdata_transfer/source/blender/editors/space_time/space_time.c
branches/meshdata_transfer/source/blender/editors/space_userpref/space_userpref.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawobject.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawvolume.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_buttons.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_edit.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_header.c
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_constraints.c
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_input.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/transform/transform_orientations.c
branches/meshdata_transfer/source/blender/editors/transform/transform_snap.c
branches/meshdata_transfer/source/blender/editors/util/crazyspace.c
branches/meshdata_transfer/source/blender/editors/util/numinput.c
branches/meshdata_transfer/source/blender/editors/util/undo.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_draw.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_intern.h
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_ops.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_buffers.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_codegen.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_draw.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_extensions.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_material.c
branches/meshdata_transfer/source/blender/gpu/intern/gpu_shader_material.glsl
branches/meshdata_transfer/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/meshdata_transfer/source/blender/ikplugin/intern/iksolver_plugin.c
branches/meshdata_transfer/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/meshdata_transfer/source/blender/imbuf/intern/anim_movie.c
branches/meshdata_transfer/source/blender/imbuf/intern/bmp.c
branches/meshdata_transfer/source/blender/imbuf/intern/dds/ColorBlock.cpp
branches/meshdata_transfer/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/meshdata_transfer/source/blender/imbuf/intern/dds/PixelFormat.h
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/indexer.c
branches/meshdata_transfer/source/blender/imbuf/intern/indexer_dv.c
branches/meshdata_transfer/source/blender/imbuf/intern/iris.c
branches/meshdata_transfer/source/blender/imbuf/intern/jp2.c
branches/meshdata_transfer/source/blender/imbuf/intern/jpeg.c
branches/meshdata_transfer/source/blender/imbuf/intern/openexr/openexr_api.cpp
branches/meshdata_transfer/source/blender/imbuf/intern/png.c
branches/meshdata_transfer/source/blender/imbuf/intern/radiance_hdr.c
branches/meshdata_transfer/source/blender/imbuf/intern/readimage.c
branches/meshdata_transfer/source/blender/imbuf/intern/rectop.c
branches/meshdata_transfer/source/blender/imbuf/intern/scaling.c
branches/meshdata_transfer/source/blender/imbuf/intern/targa.c
branches/meshdata_transfer/source/blender/imbuf/intern/thumbs.c
branches/meshdata_transfer/source/blender/imbuf/intern/util.c
branches/meshdata_transfer/source/blender/makesdna/DNA_brush_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_listBase.h
branches/meshdata_transfer/source/blender/makesdna/DNA_meshdata_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_node_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_object_fluidsim.h
branches/meshdata_transfer/source/blender/makesdna/DNA_object_force.h
branches/meshdata_transfer/source/blender/makesdna/DNA_object_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_scene_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_sequence_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_smoke_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_space_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_tracking_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_userdef_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/intern/makesrna.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_boid.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_brush.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_constraint.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_curve.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_image.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_lamp.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_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_nodetree.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_particle.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_pose.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_property.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_scene.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_smoke.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_space.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_tracking.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_ui.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/modifiers/intern/MOD_boolean.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_boolean_util.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_cast.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_collision.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_displace.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_explode.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_hook.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_mask.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_particleinstance.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_remesh.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_screw.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_simpledeform.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_util.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_uvproject.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_warp.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_wave.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/meshdata_transfer/source/blender/nodes/composite/node_composite_util.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_image.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_math.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/meshdata_transfer/source/blender/nodes/composite/nodes/node_composite_transform.c
branches/meshdata_transfer/source/blender/nodes/intern/node_common.c
branches/meshdata_transfer/source/blender/nodes/intern/node_socket.c
branches/meshdata_transfer/source/blender/nodes/shader/node_shader_util.c
branches/meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_math.c
branches/meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/meshdata_transfer/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/meshdata_transfer/source/blender/nodes/texture/nodes/node_texture_image.c
branches/meshdata_transfer/source/blender/nodes/texture/nodes/node_texture_math.c
branches/meshdata_transfer/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/meshdata_transfer/source/blender/nodes/texture/nodes/node_texture_output.c
branches/meshdata_transfer/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/meshdata_transfer/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/meshdata_transfer/source/blender/python/intern/bpy_rna.c
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_geometry.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/extern/include/RE_pipeline.h
branches/meshdata_transfer/source/blender/render/intern/include/render_types.h
branches/meshdata_transfer/source/blender/render/intern/include/sunsky.h
branches/meshdata_transfer/source/blender/render/intern/raytrace/bvh.h
branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject.cpp
branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_hint.h
branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_instance.cpp
branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
branches/meshdata_transfer/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
branches/meshdata_transfer/source/blender/render/intern/raytrace/reorganize.h
branches/meshdata_transfer/source/blender/render/intern/raytrace/svbvh.h
branches/meshdata_transfer/source/blender/render/intern/raytrace/vbvh.h
branches/meshdata_transfer/source/blender/render/intern/source/convertblender.c
branches/meshdata_transfer/source/blender/render/intern/source/envmap.c
branches/meshdata_transfer/source/blender/render/intern/source/imagetexture.c
branches/meshdata_transfer/source/blender/render/intern/source/initrender.c
branches/meshdata_transfer/source/blender/render/intern/source/occlusion.c
branches/meshdata_transfer/source/blender/render/intern/source/pipeline.c
branches/meshdata_transfer/source/blender/render/intern/source/pixelshading.c
branches/meshdata_transfer/source/blender/render/intern/source/pointdensity.c
branches/meshdata_transfer/source/blender/render/intern/source/rayshade.c
branches/meshdata_transfer/source/blender/render/intern/source/render_result.c
branches/meshdata_transfer/source/blender/render/intern/source/render_texture.c
branches/meshdata_transfer/source/blender/render/intern/source/rendercore.c
branches/meshdata_transfer/source/blender/render/intern/source/renderdatabase.c
branches/meshdata_transfer/source/blender/render/intern/source/shadbuf.c
branches/meshdata_transfer/source/blender/render/intern/source/shadeoutput.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/volumetric.c
branches/meshdata_transfer/source/blender/render/intern/source/voxeldata.c
branches/meshdata_transfer/source/blender/render/intern/source/zbuf.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_event_system.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_init_exit.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_keymap.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_operators.c
branches/meshdata_transfer/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/meshdata_transfer/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/meshdata_transfer/source/gameengine/BlenderRoutines/SConscript
branches/meshdata_transfer/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/meshdata_transfer/source/gameengine/Converter/CMakeLists.txt
branches/meshdata_transfer/source/gameengine/Converter/SConscript
branches/meshdata_transfer/source/gameengine/GamePlayer/xembed/UnixShell.c
branches/meshdata_transfer/source/gameengine/Ketsji/BL_Shader.h
branches/meshdata_transfer/source/gameengine/Ketsji/CMakeLists.txt
branches/meshdata_transfer/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/meshdata_transfer/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_FontObject.h
branches/meshdata_transfer/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_PyMath.h
branches/meshdata_transfer/source/gameengine/Ketsji/SConscript
branches/meshdata_transfer/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/meshdata_transfer/source/gameengine/VideoTexture/ImageRender.cpp
Removed Paths:
-------------
branches/meshdata_transfer/source/blender/blenlib/BLI_editVert.h
Property Changed:
----------------
branches/meshdata_transfer/
branches/meshdata_transfer/source/blender/editors/space_outliner/
Property changes on: branches/meshdata_transfer
___________________________________________________________________
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:44563-46000
+ /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-46100
Modified: branches/meshdata_transfer/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/CMakeLists.txt 2012-05-06 22:12:32 UTC (rev 46368)
+++ branches/meshdata_transfer/CMakeLists.txt 2012-05-06 22:19:13 UTC (rev 46369)
@@ -827,7 +827,7 @@
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(_WARNINGS "/W3 /wd4018 /wd4244 /wd4305 /wd4800 /wd4181 /wd4065 /wd4267 /we4013 /wd4200")
set(C_WARNINGS "${_WARNINGS}")
set(CXX_WARNINGS "${_WARNINGS}")
unset(_WARNINGS)
Modified: branches/meshdata_transfer/build_files/buildbot/master.cfg
===================================================================
--- branches/meshdata_transfer/build_files/buildbot/master.cfg 2012-05-06 22:12:32 UTC (rev 46368)
+++ branches/meshdata_transfer/build_files/buildbot/master.cfg 2012-05-06 22:19:13 UTC (rev 46369)
@@ -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/meshdata_transfer/build_files/buildbot/master_unpack.py
===================================================================
--- branches/meshdata_transfer/build_files/buildbot/master_unpack.py 2012-05-06 22:12:32 UTC (rev 46368)
+++ branches/meshdata_transfer/build_files/buildbot/master_unpack.py 2012-05-06 22:19:13 UTC (rev 46369)
@@ -48,7 +48,8 @@
tokens = filename.split("-")
platforms = ('osx', 'mac', 'bsd',
'win', 'linux', 'source',
- 'solaris')
+ 'solaris',
+ 'mingw')
platform_tokens = []
found = False
Modified: branches/meshdata_transfer/build_files/buildbot/slave_compile.py
===================================================================
--- branches/meshdata_transfer/build_files/buildbot/slave_compile.py 2012-05-06 22:12:32 UTC (rev 46368)
+++ branches/meshdata_transfer/build_files/buildbot/slave_compile.py 2012-05-06 22:19:13 UTC (rev 46369)
@@ -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/meshdata_transfer/build_files/buildbot/slave_pack.py
===================================================================
--- branches/meshdata_transfer/build_files/buildbot/slave_pack.py 2012-05-06 22:12:32 UTC (rev 46368)
+++ branches/meshdata_transfer/build_files/buildbot/slave_pack.py 2012-05-06 22:19:13 UTC (rev 46369)
@@ -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/meshdata_transfer/build_files/scons/tools/btools.py
===================================================================
--- branches/meshdata_transfer/build_files/scons/tools/btools.py 2012-05-06 22:12:32 UTC (rev 46368)
+++ branches/meshdata_transfer/build_files/scons/tools/btools.py 2012-05-06 22:19:13 UTC (rev 46369)
@@ -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/meshdata_transfer/extern/libmv/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/extern/libmv/CMakeLists.txt 2012-05-06 22:12:32 UTC (rev 46368)
+++ branches/meshdata_transfer/extern/libmv/CMakeLists.txt 2012-05-06 22:19:13 UTC (rev 46369)
@@ -69,6 +69,7 @@
libmv/simple_pipeline/detect.cc
libmv/simple_pipeline/initialize_reconstruction.cc
libmv/simple_pipeline/intersect.cc
+ libmv/simple_pipeline/modal_solver.cc
libmv/simple_pipeline/pipeline.cc
libmv/simple_pipeline/reconstruction.cc
libmv/simple_pipeline/resect.cc
@@ -126,6 +127,7 @@
libmv/simple_pipeline/detect.h
libmv/simple_pipeline/initialize_reconstruction.h
libmv/simple_pipeline/intersect.h
+ libmv/simple_pipeline/modal_solver.h
libmv/simple_pipeline/pipeline.h
libmv/simple_pipeline/reconstruction.h
libmv/simple_pipeline/resect.h
Modified: branches/meshdata_transfer/extern/libmv/ChangeLog
===================================================================
--- branches/meshdata_transfer/extern/libmv/ChangeLog 2012-05-06 22:12:32 UTC (rev 46368)
+++ branches/meshdata_transfer/extern/libmv/ChangeLog 2012-05-06 22:19:13 UTC (rev 46369)
@@ -1,3 +1,16 @@
+commit a44312a7beb2963b8e3bf8015c516d2eff40cc3d
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date: Thu Apr 12 13:56:02 2012 +0600
+
+ Added solver for modal camera motion, currently supports only tripod solving
+
+ This solver is intended to deal with such camera motions as tripod and panning,
+ where it's impossible to reconstruct exact position of markers in 3d view.
+
+ It projects markers onto sphere and uses rigid registration of rotation to
+ find rotation angles which makes bundles from previous and current frame be
+ as closest as it's possible.
+
commit fa3842e472e3b9c789e47bf6d8f592aa40a84f16
Author: Sergey Sharybin <sergey.vfx at gmail.com>
Date: Thu Apr 12 12:32:48 2012 +0600
@@ -520,9 +533,3 @@
Date: Fri Aug 19 16:04:37 2011 +0200
MSVC compatibility: heap allocate pattern, explicit float cast.
-
-commit 702658d2f8616964a6eeb3743fd85e97ac7ff09d
-Author: Matthias Fauconneau <matthias.fauconneau at gmail.com>
-Date: Fri Aug 19 14:59:24 2011 +0200
-
- Expose regularization parameters (areaPenalty and conditionPenalty) in API.
Modified: branches/meshdata_transfer/extern/libmv/files.txt
===================================================================
--- branches/meshdata_transfer/extern/libmv/files.txt 2012-05-06 22:12:32 UTC (rev 46368)
+++ branches/meshdata_transfer/extern/libmv/files.txt 2012-05-06 22:19:13 UTC (rev 46369)
@@ -42,6 +42,8 @@
libmv/simple_pipeline/initialize_reconstruction.h
libmv/simple_pipeline/intersect.cc
libmv/simple_pipeline/intersect.h
+libmv/simple_pipeline/modal_solver.cc
+libmv/simple_pipeline/modal_solver.h
libmv/simple_pipeline/pipeline.cc
libmv/simple_pipeline/pipeline.h
libmv/simple_pipeline/reconstruction.cc
Modified: branches/meshdata_transfer/extern/libmv/libmv-capi.cpp
===================================================================
--- branches/meshdata_transfer/extern/libmv/libmv-capi.cpp 2012-05-06 22:12:32 UTC (rev 46368)
+++ branches/meshdata_transfer/extern/libmv/libmv-capi.cpp 2012-05-06 22:19:13 UTC (rev 46369)
@@ -54,6 +54,7 @@
#include "libmv/simple_pipeline/pipeline.h"
#include "libmv/simple_pipeline/camera_intrinsics.h"
#include "libmv/simple_pipeline/rigid_registration.h"
+#include "libmv/simple_pipeline/modal_solver.h"
#include <stdlib.h>
#include <assert.h>
@@ -384,7 +385,32 @@
LIBMV_REFINE_RADIAL_DISTORTION_K1));
}
+void libmv_solveRefineIntrinsics(libmv::Tracks *tracks, libmv::CameraIntrinsics *intrinsics,
+ libmv::EuclideanReconstruction *reconstruction, int refine_intrinsics,
+ reconstruct_progress_update_cb progress_update_callback, void *callback_customdata)
+{
+ /* only a few combinations are supported but trust the caller */
+ int libmv_refine_flags = 0;
+ if (refine_intrinsics & LIBMV_REFINE_FOCAL_LENGTH) {
+ libmv_refine_flags |= libmv::BUNDLE_FOCAL_LENGTH;
+ }
+ if (refine_intrinsics & LIBMV_REFINE_PRINCIPAL_POINT) {
+ libmv_refine_flags |= libmv::BUNDLE_PRINCIPAL_POINT;
+ }
+ if (refine_intrinsics & LIBMV_REFINE_RADIAL_DISTORTION_K1) {
+ libmv_refine_flags |= libmv::BUNDLE_RADIAL_K1;
+ }
+ if (refine_intrinsics & LIBMV_REFINE_RADIAL_DISTORTION_K2) {
+ libmv_refine_flags |= libmv::BUNDLE_RADIAL_K2;
+ }
+
+ progress_update_callback(callback_customdata, 1.0, "Refining solution");
+
+ libmv::EuclideanBundleCommonIntrinsics(*(libmv::Tracks *)tracks, libmv_refine_flags,
+ reconstruction, intrinsics);
+}
+
libmv_Reconstruction *libmv_solveReconstruction(libmv_Tracks *tracks, int keyframe1, int keyframe2,
int refine_intrinsics, double focal_length, double principal_x, double principal_y, double k1, double k2, double k3,
reconstruct_progress_update_cb progress_update_callback, void *callback_customdata)
@@ -423,26 +449,45 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list