[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46434] branches/meshdata_transfer: merging back to a version that works...
Ove Murberg Henriksen
sorayasilvermoon at hotmail.com
Tue May 8 21:49:41 CEST 2012
Revision: 46434
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46434
Author: cyborgmuppet
Date: 2012-05-08 19:49:39 +0000 (Tue, 08 May 2012)
Log Message:
-----------
merging back to a version that works...
svn merge -r46433:46359 .
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46433
Modified Paths:
--------------
branches/meshdata_transfer/CMakeLists.txt
branches/meshdata_transfer/GNUmakefile
branches/meshdata_transfer/SConstruct
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/cmake/cmake_consistency_check.py
branches/meshdata_transfer/build_files/cmake/cmake_netbeans_project.py
branches/meshdata_transfer/build_files/cmake/cmake_qtcreator_project.py
branches/meshdata_transfer/build_files/cmake/cmake_static_check_cppcheck.py
branches/meshdata_transfer/build_files/cmake/cmake_static_check_sparse.py
branches/meshdata_transfer/build_files/cmake/cmake_static_check_splint.py
branches/meshdata_transfer/build_files/cmake/example_scripts/make_quicky.py
branches/meshdata_transfer/build_files/cmake/project_info.py
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/config/win64-vc-config.py
branches/meshdata_transfer/build_files/scons/tools/btools.py
branches/meshdata_transfer/doc/blender_file_format/BlendFileDnaExporter_25.py
branches/meshdata_transfer/doc/blender_file_format/BlendFileReader.py
branches/meshdata_transfer/doc/manpage/blender.1
branches/meshdata_transfer/doc/python_api/examples/bpy.types.Mesh.py
branches/meshdata_transfer/doc/python_api/rst/bgl.rst
branches/meshdata_transfer/extern/bullet2/src/BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h
branches/meshdata_transfer/extern/bullet2/src/LinearMath/btSerializer.h
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/SConscript
branches/meshdata_transfer/intern/audaspace/intern/AUD_Buffer.cpp
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/audaspace/intern/AUD_SequencerHandle.cpp
branches/meshdata_transfer/intern/container/CTR_Map.h
branches/meshdata_transfer/intern/cycles/app/cycles_xml.cpp
branches/meshdata_transfer/intern/cycles/blender/addon/__init__.py
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_camera.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_mesh.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_object.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_session.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_shader.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_sync.cpp
branches/meshdata_transfer/intern/cycles/blender/blender_sync.h
branches/meshdata_transfer/intern/cycles/blender/blender_util.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/CMakeLists.txt
branches/meshdata_transfer/intern/cycles/kernel/kernel_accumulate.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_bvh.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_camera.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_compat_opencl.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_emission.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_light.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_montecarlo.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_object.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_passes.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_path.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_shader.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_textures.h
branches/meshdata_transfer/intern/cycles/kernel/kernel_triangle.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_gamma.h
branches/meshdata_transfer/intern/cycles/kernel/svm/svm_light_path.h
branches/meshdata_transfer/intern/cycles/kernel/svm/svm_mapping.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/CMakeLists.txt
branches/meshdata_transfer/intern/cycles/render/attribute.cpp
branches/meshdata_transfer/intern/cycles/render/attribute.h
branches/meshdata_transfer/intern/cycles/render/buffers.cpp
branches/meshdata_transfer/intern/cycles/render/camera.cpp
branches/meshdata_transfer/intern/cycles/render/camera.h
branches/meshdata_transfer/intern/cycles/render/film.cpp
branches/meshdata_transfer/intern/cycles/render/film.h
branches/meshdata_transfer/intern/cycles/render/graph.cpp
branches/meshdata_transfer/intern/cycles/render/image.cpp
branches/meshdata_transfer/intern/cycles/render/image.h
branches/meshdata_transfer/intern/cycles/render/integrator.cpp
branches/meshdata_transfer/intern/cycles/render/integrator.h
branches/meshdata_transfer/intern/cycles/render/light.cpp
branches/meshdata_transfer/intern/cycles/render/mesh.cpp
branches/meshdata_transfer/intern/cycles/render/mesh.h
branches/meshdata_transfer/intern/cycles/render/mesh_displace.cpp
branches/meshdata_transfer/intern/cycles/render/nodes.cpp
branches/meshdata_transfer/intern/cycles/render/nodes.h
branches/meshdata_transfer/intern/cycles/render/object.cpp
branches/meshdata_transfer/intern/cycles/render/object.h
branches/meshdata_transfer/intern/cycles/render/scene.cpp
branches/meshdata_transfer/intern/cycles/render/scene.h
branches/meshdata_transfer/intern/cycles/render/session.cpp
branches/meshdata_transfer/intern/cycles/render/shader.cpp
branches/meshdata_transfer/intern/cycles/render/shader.h
branches/meshdata_transfer/intern/cycles/render/svm.cpp
branches/meshdata_transfer/intern/cycles/render/svm.h
branches/meshdata_transfer/intern/cycles/subd/subd_dice.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_transform.h
branches/meshdata_transfer/intern/cycles/util/util_types.h
branches/meshdata_transfer/intern/elbeem/intern/ntl_geometrymodel.cpp
branches/meshdata_transfer/intern/ghost/GHOST_Rect.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemCocoa.h
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_SystemX11.cpp
branches/meshdata_transfer/intern/ghost/intern/GHOST_Window.h
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/tools/bpy_introspect_ui.py
branches/meshdata_transfer/intern/tools/credits_svn_gen.py
branches/meshdata_transfer/intern/tools/dump_rna2xml.py
branches/meshdata_transfer/intern/utfconv/utf_winfunc.c
branches/meshdata_transfer/release/datafiles/splash.png
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/modules/blend_render_info.py
branches/meshdata_transfer/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_animviz.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_armature.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_game.py
branches/meshdata_transfer/release/scripts/startup/bl_ui/properties_object.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_info.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_time.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/startup/keyingsets_builtins.py
branches/meshdata_transfer/release/scripts/templates/operator_modal_timer.py
branches/meshdata_transfer/release/windows/installer/00.sconsblender.nsi
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/endian.h
branches/meshdata_transfer/source/blender/avi/intern/mjpeg.c
branches/meshdata_transfer/source/blender/avi/intern/options.c
branches/meshdata_transfer/source/blender/avi/intern/rgb32.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_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_brush.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_camera.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_cloth.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_constraint.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_deform.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_font.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_gpencil.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_group.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_image.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_ipo.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_key.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_lamp.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_material.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_object.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_ocean.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_particle.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_softbody.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_sound.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_speaker.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_tessmesh.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_text.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_texture.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_tracking.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_utildefines.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_world.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_writeavi.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_writeffmpeg.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_writeframeserver.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/booleanops_mesh.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/lamp.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/mesh_validate.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/screen.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/speaker.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/world.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/intern/writeframeserver.c
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_boxpack2d.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_fileops.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_jitter.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_vector.h
branches/meshdata_transfer/source/blender/blenlib/BLI_memarena.h
branches/meshdata_transfer/source/blender/blenlib/BLI_path_util.h
branches/meshdata_transfer/source/blender/blenlib/BLI_scanfill.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_uvproject.h
branches/meshdata_transfer/source/blender/blenlib/BLI_voxel.h
branches/meshdata_transfer/source/blender/blenlib/CMakeLists.txt
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_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/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/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/scanfill.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_cursor_utf8.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/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/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/documentation.h
branches/meshdata_transfer/source/blender/blenpluginapi/externdef.h
branches/meshdata_transfer/source/blender/blenpluginapi/floatpatch.h
branches/meshdata_transfer/source/blender/blenpluginapi/iff.h
branches/meshdata_transfer/source/blender/blenpluginapi/intern/pluginapi.c
branches/meshdata_transfer/source/blender/blenpluginapi/plugin.h
branches/meshdata_transfer/source/blender/blenpluginapi/util.h
branches/meshdata_transfer/source/blender/bmesh/CMakeLists.txt
branches/meshdata_transfer/source/blender/bmesh/bmesh.h
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_interp.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_interp.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_marking.c
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_marking.h
branches/meshdata_transfer/source/blender/bmesh/intern/bmesh_mesh.c
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_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_dissolve.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_primitive.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/bmesh/tools/BME_bevel.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/DocumentImporter.h
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/ExportSettings.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/MeshImporter.h
branches/meshdata_transfer/source/blender/collada/SceneExporter.cpp
branches/meshdata_transfer/source/blender/collada/SkinInfo.cpp
branches/meshdata_transfer/source/blender/collada/SkinInfo.h
branches/meshdata_transfer/source/blender/collada/TransformReader.cpp
branches/meshdata_transfer/source/blender/collada/TransformWriter.cpp
branches/meshdata_transfer/source/blender/collada/collada.cpp
branches/meshdata_transfer/source/blender/collada/collada.h
branches/meshdata_transfer/source/blender/collada/collada_internal.cpp
branches/meshdata_transfer/source/blender/collada/collada_utils.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/curve_ops.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/datafiles/Bfont.c
branches/meshdata_transfer/source/blender/editors/datafiles/splash.png.c
branches/meshdata_transfer/source/blender/editors/datafiles/startup.blend.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/gpencil/gpencil_undo.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_fluidsim.h
branches/meshdata_transfer/source/blender/editors/include/ED_keyframing.h
branches/meshdata_transfer/source/blender/editors/include/ED_mesh.h
branches/meshdata_transfer/source/blender/editors/include/ED_particle.h
branches/meshdata_transfer/source/blender/editors/include/ED_physics.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_uvedit.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_resources.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_ops.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_data.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/physics/physics_pointcache.c
branches/meshdata_transfer/source/blender/editors/render/render_internal.c
branches/meshdata_transfer/source/blender/editors/render/render_opengl.c
branches/meshdata_transfer/source/blender/editors/render/render_preview.c
branches/meshdata_transfer/source/blender/editors/render/render_shading.c
branches/meshdata_transfer/source/blender/editors/render/render_update.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_context.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/screen/screendump.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_cursor.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_hide.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_undo.c
branches/meshdata_transfer/source/blender/editors/sculpt_paint/paint_utils.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/sculpt_paint/sculpt_uv.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_ops.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/buttons_texture.c
branches/meshdata_transfer/source/blender/editors/space_buttons/space_buttons.c
branches/meshdata_transfer/source/blender/editors/space_clip/CMakeLists.txt
branches/meshdata_transfer/source/blender/editors/space_clip/SConscript
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_ops.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_buttons.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_ops.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_buttons.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_header.c
branches/meshdata_transfer/source/blender/editors/space_node/node_intern.h
branches/meshdata_transfer/source/blender/editors/space_node/node_ops.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_intern.h
branches/meshdata_transfer/source/blender/editors/space_outliner/outliner_ops.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_scopes.c
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/drawanimviz.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawarmature.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawmesh.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/space_view3d.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_buttons.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_draw.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_edit.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_fly.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_header.c
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_intern.h
branches/meshdata_transfer/source/blender/editors/space_view3d/view3d_ops.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/space_view3d/view3d_view.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_buttons.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_parametrizer.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/meshdata_transfer/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/meshdata_transfer/source/blender/gpu/CMakeLists.txt
branches/meshdata_transfer/source/blender/gpu/GPU_extensions.h
branches/meshdata_transfer/source/blender/gpu/GPU_material.h
branches/meshdata_transfer/source/blender/gpu/SConscript
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/ikplugin/intern/iksolver_plugin.c
branches/meshdata_transfer/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/meshdata_transfer/source/blender/imbuf/IMB_imbuf_types.h
branches/meshdata_transfer/source/blender/imbuf/intern/IMB_allocimbuf.h
branches/meshdata_transfer/source/blender/imbuf/intern/IMB_anim.h
branches/meshdata_transfer/source/blender/imbuf/intern/IMB_filter.h
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/cineon/cineonfile.h
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/cineonlib.c
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/cineonlib.h
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/dpxfile.h
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/dpxlib.c
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/dpxlib.h
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/logImageCore.c
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/logImageCore.h
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/logImageLib.c
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/logImageLib.h
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/logmemfile.c
branches/meshdata_transfer/source/blender/imbuf/intern/cineon/logmemfile.h
branches/meshdata_transfer/source/blender/imbuf/intern/dds/ColorBlock.cpp
branches/meshdata_transfer/source/blender/imbuf/intern/dds/ColorBlock.h
branches/meshdata_transfer/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
branches/meshdata_transfer/source/blender/imbuf/intern/dds/DirectDrawSurface.h
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/imbuf.h
branches/meshdata_transfer/source/blender/imbuf/intern/imbuf_cocoa.m
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/tiff.c
branches/meshdata_transfer/source/blender/imbuf/intern/util.c
branches/meshdata_transfer/source/blender/makesdna/DNA_action_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_boid_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_brush_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_curve_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_group_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_lamp_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_modifier_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_particle_types.h
branches/meshdata_transfer/source/blender/makesdna/DNA_property_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/RNA_access.h
branches/meshdata_transfer/source/blender/makesrna/RNA_enum_types.h
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_animviz.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_armature.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_camera.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_camera_api.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_image_api.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_material_api.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_nodetree.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_nodetree_types.h
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_pose_api.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_scene_api.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_screen.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_test.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_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/makesrna/rna_cleanup/rna_cleaner.py
branches/meshdata_transfer/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_armature.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_array.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_bevel.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_boolean_util.h
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_build.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_cast.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_cloth.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_collision.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_curve.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_decimate.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_displace.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_dynamicpaint.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_edgesplit.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_explode.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_fluidsim.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_lattice.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_mask.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_meshdeform.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_mirror.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_multires.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_none.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_ocean.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_particleinstance.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_particlesystem.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_shapekey.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_simpledeform.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_smoke.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_smooth.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_softbody.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_solidify.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_subsurf.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_surface.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/modifiers/intern/MOD_weightvgedit.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_weightvgmix.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/meshdata_transfer/source/blender/nodes/CMakeLists.txt
branches/meshdata_transfer/source/blender/nodes/NOD_shader.h
branches/meshdata_transfer/source/blender/nodes/composite/node_composite_tree.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_blur.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_defocus.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_outputFile.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_splitViewer.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/composite/nodes/node_composite_viewer.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_tree.c
branches/meshdata_transfer/source/blender/nodes/shader/node_shader_util.c
branches/meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/meshdata_transfer/source/blender/nodes/shader/nodes/node_shader_light_path.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_valToRgb.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.h
branches/meshdata_transfer/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/meshdata_transfer/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/meshdata_transfer/source/blender/python/bmesh/bmesh_py_types_meshdata.h
branches/meshdata_transfer/source/blender/python/intern/bpy.c
branches/meshdata_transfer/source/blender/python/intern/bpy_app_handlers.c
branches/meshdata_transfer/source/blender/python/intern/bpy_rna.c
branches/meshdata_transfer/source/blender/python/mathutils/mathutils.h
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_Color.c
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_Color.h
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_Euler.c
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_Euler.h
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_Matrix.c
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_Quaternion.h
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_Vector.h
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_geometry.c
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_geometry.h
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/gammaCorrectionTables.h
branches/meshdata_transfer/source/blender/render/intern/include/initrender.h
branches/meshdata_transfer/source/blender/render/intern/include/occlusion.h
branches/meshdata_transfer/source/blender/render/intern/include/render_types.h
branches/meshdata_transfer/source/blender/render/intern/include/rendercore.h
branches/meshdata_transfer/source/blender/render/intern/include/shadbuf.h
branches/meshdata_transfer/source/blender/render/intern/include/sunsky.h
branches/meshdata_transfer/source/blender/render/intern/include/texture.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_internal.h
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/external_engine.c
branches/meshdata_transfer/source/blender/render/intern/source/gammaCorrectionTables.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/pixelblending.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/WM_api.h
branches/meshdata_transfer/source/blender/windowmanager/intern/wm.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_event_system.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_files.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_gesture.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_init_exit.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_jobs.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/blender/windowmanager/intern/wm_window.c
branches/meshdata_transfer/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/meshdata_transfer/source/creator/CMakeLists.txt
branches/meshdata_transfer/source/creator/creator.c
branches/meshdata_transfer/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/meshdata_transfer/source/gameengine/BlenderRoutines/SConscript
branches/meshdata_transfer/source/gameengine/Converter/BL_ActionActuator.cpp
branches/meshdata_transfer/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/meshdata_transfer/source/gameengine/Converter/BL_ArmatureObject.h
branches/meshdata_transfer/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/meshdata_transfer/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/meshdata_transfer/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/meshdata_transfer/source/gameengine/Converter/CMakeLists.txt
branches/meshdata_transfer/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/meshdata_transfer/source/gameengine/Converter/KX_ConvertProperties.h
branches/meshdata_transfer/source/gameengine/Converter/SConscript
branches/meshdata_transfer/source/gameengine/Expressions/KX_HashedPtr.cpp
branches/meshdata_transfer/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/meshdata_transfer/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
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_GameObject.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_Light.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/KX_Light.h
branches/meshdata_transfer/source/gameengine/Ketsji/KX_PyMath.h
branches/meshdata_transfer/source/gameengine/Ketsji/KX_PythonSeq.h
branches/meshdata_transfer/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/meshdata_transfer/source/gameengine/Ketsji/SConscript
branches/meshdata_transfer/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/meshdata_transfer/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/meshdata_transfer/source/gameengine/VideoTexture/ImageRender.cpp
branches/meshdata_transfer/source/gameengine/VideoTexture/Texture.cpp
branches/meshdata_transfer/source/tools/tag_release.py
branches/meshdata_transfer/source/tools/uncrustify.cfg
branches/meshdata_transfer/source/tools/uncrustify_clean.sh
Added Paths:
-----------
branches/meshdata_transfer/extern/bullet2/patches/
branches/meshdata_transfer/extern/bullet2/patches/MinGW64-nopermissive.patch
branches/meshdata_transfer/extern/bullet2/patches/mingw64_scons.patch
branches/meshdata_transfer/intern/audaspace/patches/
branches/meshdata_transfer/intern/audaspace/patches/mingw64-nopermissive.patch
branches/meshdata_transfer/intern/elbeem/patches/
branches/meshdata_transfer/intern/elbeem/patches/mingw64_nopermissive.patch
branches/meshdata_transfer/source/blender/blenlib/BLI_editVert.h
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/gpu/intern/gpu_shader_vertex.glsl
branches/meshdata_transfer/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
Removed Paths:
-------------
branches/meshdata_transfer/extern/bullet2/patches/MinGW64-nopermissive.patch
branches/meshdata_transfer/extern/bullet2/patches/mingw64_scons.patch
branches/meshdata_transfer/intern/audaspace/patches/mingw64-nopermissive.patch
branches/meshdata_transfer/intern/elbeem/patches/mingw64_nopermissive.patch
branches/meshdata_transfer/source/blender/gpu/shaders/
Property Changed:
----------------
branches/meshdata_transfer/
branches/meshdata_transfer/build_files/scons/config/win64-mingw-config.py
branches/meshdata_transfer/intern/tools/credits_svn_gen.py
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-46200,46301-46407
+ /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-45927
Modified: branches/meshdata_transfer/CMakeLists.txt
===================================================================
--- branches/meshdata_transfer/CMakeLists.txt 2012-05-08 18:29:02 UTC (rev 46433)
+++ branches/meshdata_transfer/CMakeLists.txt 2012-05-08 19:49:39 UTC (rev 46434)
@@ -228,10 +228,6 @@
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
endif()
option(WITH_PYTHON_INSTALL "Copy system python into the blender install folder" ON)
-option(WITH_PYTHON_INSTALL_NUMPY "Copy system numpy into the blender install folder" ON)
-set(PYTHON_NUMPY_PATH "" CACHE PATH "Python to python site-packages or dist-packages containing 'numpy' module")
-mark_as_advanced(PYTHON_NUMPY_PATH)
-
option(WITH_MINGW64 "Use the 64-bit version of MinGW" OFF)
mark_as_advanced(WITH_MINGW64)
@@ -307,7 +303,7 @@
#-----------------------------------------------------------------------------
# Check for conflicting/unsupported configurations
-if(NOT WITH_BLENDER AND NOT WITH_PLAYER AND NOT WITH_CYCLES_TEST)
+if(NOT WITH_BLENDER AND NOT WITH_PLAYER)
message(FATAL_ERROR "At least one of WITH_BLENDER or WITH_PLAYER must be enabled, nothing to do!")
endif()
@@ -806,36 +802,34 @@
endif()
if(MSVC)
- set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
+ if(CMAKE_CL_64)
+ set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
+ else()
+ set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
+ endif()
add_definitions(/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB)
- set(CMAKE_CXX_FLAGS "/nologo /J /Gd /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
- set(CMAKE_C_FLAGS "/nologo /J /Gd" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_CXX_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_C_FLAGS "/nologo /J /W1 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
if(CMAKE_CL_64)
- set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /Zi" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
else()
- set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /ZI" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
endif()
- set(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /MT" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /MT" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /MT /Zi" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
if(CMAKE_CL_64)
- set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /Zi" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
else()
- set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /RTC1 /MTd /ZI" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_DEBUG "/Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
endif()
- set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /MT" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /MT" CACHE STRING "MSVC MT flags " FORCE)
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /MT /Zi" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
- # most msvc warnings are C & C++
- set(_WARNINGS "/W3 /wd4018 /wd4244 /wd4305 /wd4800 /wd4181 /wd4065 /wd4267 /we4013 /wd4200")
- set(C_WARNINGS "${_WARNINGS}")
- set(CXX_WARNINGS "${_WARNINGS}")
- unset(_WARNINGS)
-
if(WITH_INTERNATIONAL)
set(GETTEXT ${LIBDIR}/gettext)
set(GETTEXT_INCLUDE_DIRS ${GETTEXT}/include)
@@ -1007,9 +1001,6 @@
set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
- # used in many places so include globally, like OpenGL
- blender_include_dirs("${PTHREADS_INCLUDE_DIRS}")
-
elseif(CMAKE_COMPILER_IS_GNUCC)
# keep GCC specific stuff here
set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi")
@@ -1017,8 +1008,10 @@
if(WITH_MINGW64)
#Yes, the point for MinGW64 is moar optimization by default :)
- set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2 -ftree-vectorize")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+ set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2")
+ set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
+ set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
+ #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
add_definitions(-DFREE_WINDOWS64 -DMS_WIN64)
@@ -1163,6 +1156,9 @@
endif()
+ # used in many places so include globally, like OpenGL
+ blender_include_dirs("${PTHREADS_INCLUDE_DIRS}")
+
elseif(APPLE)
if(${CMAKE_OSX_DEPLOYMENT_TARGET} STREQUAL "10.5" OR ${CMAKE_OSX_DEPLOYMENT_TARGET} STRGREATER "10.5")
@@ -1616,50 +1612,6 @@
"to a valid python include path. Containing "
"Python.h for python version \"${PYTHON_VERSION}\"")
endif()
-
- if(WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY)
- # set but invalid
- if(NOT ${PYTHON_NUMPY_PATH} STREQUAL "")
- if(NOT EXISTS "${PYTHON_NUMPY_PATH}/numpy")
- message(WARNING "PYTHON_NUMPY_PATH is invalid, numpy not found in '${PYTHON_NUMPY_PATH}' "
- "WITH_PYTHON_INSTALL_NUMPY option will be ignored when installing python")
- set(WITH_PYTHON_INSTALL_NUMPY OFF)
- endif()
- # not set, so initialize
- else()
- string(REPLACE "." ";" _PY_VER_SPLIT "${PYTHON_VERSION}")
- list(GET _PY_VER_SPLIT 0 _PY_VER_MAJOR)
-
- # re-cache
- unset(PYTHON_NUMPY_PATH CACHE)
- find_path(PYTHON_NUMPY_PATH
- NAMES
- numpy
- HINTS
- "${PYTHON_LIBPATH}/python${PYTHON_VERSION}/"
- "${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/"
- PATH_SUFFIXES
- site-packages
- dist-packages
- NO_DEFAULT_PATH
- )
-
- if(NOT EXISTS "${PYTHON_NUMPY_PATH}")
- message(WARNING "'numpy' path could not be found in:\n"
- "'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/numpy', "
- "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/site-packages/numpy', "
- "'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/dist-packages/numpy', "
- "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/dist-packages/numpy', "
- "WITH_PYTHON_INSTALL_NUMPY option will be ignored when installing python")
- set(WITH_PYTHON_INSTALL_NUMPY OFF)
- else()
- message(STATUS "numpy found at '${PYTHON_NUMPY_PATH}'")
- endif()
-
- unset(_PY_VER_SPLIT)
- unset(_PY_VER_MAJOR)
- endif()
- endif()
endif()
@@ -1716,7 +1668,7 @@
_setting)
set(_msg " * ${_setting}")
string(LENGTH "${_msg}" _len)
- while("32" GREATER "${_len}")
+ while("28" GREATER "${_len}")
set(_msg "${_msg} ")
math(EXPR _len "${_len} + 1")
endwhile()
@@ -1776,7 +1728,6 @@
info_cfg_text("Python:")
info_cfg_option(WITH_PYTHON_INSTALL)
- info_cfg_option(WITH_PYTHON_INSTALL_NUMPY)
info_cfg_option(WITH_PYTHON_MODULE)
info_cfg_option(WITH_PYTHON_SAFETY)
Modified: branches/meshdata_transfer/GNUmakefile
===================================================================
--- branches/meshdata_transfer/GNUmakefile 2012-05-08 18:29:02 UTC (rev 46433)
+++ branches/meshdata_transfer/GNUmakefile 2012-05-08 19:49:39 UTC (rev 46434)
@@ -164,7 +164,6 @@
@echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
@echo " * test_pep8 - checks all python script are pep8 which are tagged to use the stricter formatting"
@echo " * test_deprecated - checks for deprecation tags in our code which may need to be removed"
- @echo " * test_style - checks C/C++ conforms with blenders style guide: http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
@echo ""
@echo "Static Source Code Checking (not assosiated with building blender)"
@echo " * check_cppcheck - run blender source through cppcheck (C & C++)"
@@ -202,31 +201,28 @@
# run pep8 check check on scripts we distribute.
test_pep8:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list