[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45327] branches/asset-browser: merge from trunk: rev.

[Andrea Weikert]

Revision: 45327
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45327
Author:   elubie
Date:     2012-04-02 06:03:36 +0000 (Mon, 02 Apr 2012)
Log Message:
-----------
merge from trunk: rev. 44987-45321

conflicts in storage.c and filelist.c resolved, these need to be watched closely when merging back later on.

Modified Paths:
--------------
    branches/asset-browser/build_files/scons/tools/Blender.py
    branches/asset-browser/doc/python_api/rst/bge.types.rst
    branches/asset-browser/doc/python_api/rst/include__bmesh.rst
    branches/asset-browser/doc/python_api/rst/info_best_practice.rst
    branches/asset-browser/doc/python_api/rst/info_gotcha.rst
    branches/asset-browser/doc/python_api/sphinx_doc_gen.py
    branches/asset-browser/extern/eltopo/common/array1.h
    branches/asset-browser/extern/eltopo/common/array2.h
    branches/asset-browser/extern/eltopo/common/array3.h
    branches/asset-browser/extern/eltopo/common/array3_utils.h
    branches/asset-browser/extern/eltopo/common/bfstream.cpp
    branches/asset-browser/extern/eltopo/common/bfstream.h
    branches/asset-browser/extern/eltopo/common/blas_wrapper.h
    branches/asset-browser/extern/eltopo/common/ccd_wrapper.cpp
    branches/asset-browser/extern/eltopo/common/ccd_wrapper.h
    branches/asset-browser/extern/eltopo/common/collisionqueries.cpp
    branches/asset-browser/extern/eltopo/common/collisionqueries.h
    branches/asset-browser/extern/eltopo/common/cubic_ccd_wrapper.cpp
    branches/asset-browser/extern/eltopo/common/fileio.cpp
    branches/asset-browser/extern/eltopo/common/fileio.h
    branches/asset-browser/extern/eltopo/common/gluvi.cpp
    branches/asset-browser/extern/eltopo/common/gluvi.h
    branches/asset-browser/extern/eltopo/common/grid3.h
    branches/asset-browser/extern/eltopo/common/hashtable.h
    branches/asset-browser/extern/eltopo/common/lapack_wrapper.h
    branches/asset-browser/extern/eltopo/common/makelevelset3.cpp
    branches/asset-browser/extern/eltopo/common/makelevelset3.h
    branches/asset-browser/extern/eltopo/common/mat.h
    branches/asset-browser/extern/eltopo/common/matlapack.h
    branches/asset-browser/extern/eltopo/common/newsparse/dense_matrix.cpp
    branches/asset-browser/extern/eltopo/common/newsparse/dense_matrix.h
    branches/asset-browser/extern/eltopo/common/newsparse/krylov_solvers.cpp
    branches/asset-browser/extern/eltopo/common/newsparse/krylov_solvers.h
    branches/asset-browser/extern/eltopo/common/newsparse/linear_operator.h
    branches/asset-browser/extern/eltopo/common/newsparse/sparse_matrix.cpp
    branches/asset-browser/extern/eltopo/common/newsparse/sparse_matrix.h
    branches/asset-browser/extern/eltopo/common/predicates.cpp
    branches/asset-browser/extern/eltopo/common/predicates.h
    branches/asset-browser/extern/eltopo/common/tunicate/expansion.cpp
    branches/asset-browser/extern/eltopo/common/tunicate/expansion.h
    branches/asset-browser/extern/eltopo/common/tunicate/intersection.cpp
    branches/asset-browser/extern/eltopo/common/tunicate/neg.cpp
    branches/asset-browser/extern/eltopo/common/tunicate/neg.h
    branches/asset-browser/extern/eltopo/common/tunicate/orientation.cpp
    branches/asset-browser/extern/eltopo/common/tunicate/sos_intersection.cpp
    branches/asset-browser/extern/eltopo/common/tunicate/sos_orientation.cpp
    branches/asset-browser/extern/eltopo/common/tunicate/tunicate.h
    branches/asset-browser/extern/eltopo/common/util.h
    branches/asset-browser/extern/eltopo/common/vec.h
    branches/asset-browser/extern/eltopo/common/vector_math.h
    branches/asset-browser/extern/eltopo/common/wallclocktime.cpp
    branches/asset-browser/extern/eltopo/eltopo-capi.cpp
    branches/asset-browser/extern/eltopo/eltopo-capi.h
    branches/asset-browser/extern/eltopo/eltopo3d/Makefile
    branches/asset-browser/extern/eltopo/eltopo3d/Makefile.example_defs
    branches/asset-browser/extern/eltopo/eltopo3d/Makefile.inc
    branches/asset-browser/extern/eltopo/eltopo3d/accelerationgrid.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/accelerationgrid.h
    branches/asset-browser/extern/eltopo/eltopo3d/broadphase.h
    branches/asset-browser/extern/eltopo/eltopo3d/broadphasegrid.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/broadphasegrid.h
    branches/asset-browser/extern/eltopo/eltopo3d/dynamicsurface.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/dynamicsurface.h
    branches/asset-browser/extern/eltopo/eltopo3d/eltopo.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/eltopo.h
    branches/asset-browser/extern/eltopo/eltopo3d/nondestructivetrimesh.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/nondestructivetrimesh.h
    branches/asset-browser/extern/eltopo/eltopo3d/options.h
    branches/asset-browser/extern/eltopo/eltopo3d/subdivisionscheme.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/subdivisionscheme.h
    branches/asset-browser/extern/eltopo/eltopo3d/surftrack.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/surftrack.h
    branches/asset-browser/extern/libmv/CMakeLists.txt
    branches/asset-browser/extern/libmv/bundle.sh
    branches/asset-browser/extern/libmv/libmv/image/sample.h
    branches/asset-browser/extern/libmv/libmv/tracking/brute_region_tracker.cc
    branches/asset-browser/extern/libmv/libmv/tracking/brute_region_tracker.h
    branches/asset-browser/extern/libmv/libmv/tracking/esm_region_tracker.cc
    branches/asset-browser/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
    branches/asset-browser/extern/libmv/libmv-capi.cpp
    branches/asset-browser/extern/libmv/libmv-capi.h
    branches/asset-browser/intern/CMakeLists.txt
    branches/asset-browser/intern/SConscript
    branches/asset-browser/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/asset-browser/intern/boolop/intern/BOP_CarveInterface.cpp
    branches/asset-browser/intern/cycles/app/cycles_xml.cpp
    branches/asset-browser/intern/cycles/blender/addon/properties.py
    branches/asset-browser/intern/cycles/blender/addon/ui.py
    branches/asset-browser/intern/cycles/blender/blender_mesh.cpp
    branches/asset-browser/intern/cycles/blender/blender_session.cpp
    branches/asset-browser/intern/cycles/blender/blender_shader.cpp
    branches/asset-browser/intern/cycles/blender/blender_sync.cpp
    branches/asset-browser/intern/cycles/blender/blender_util.h
    branches/asset-browser/intern/cycles/kernel/CMakeLists.txt
    branches/asset-browser/intern/cycles/kernel/kernel_accumulate.h
    branches/asset-browser/intern/cycles/kernel/kernel_camera.h
    branches/asset-browser/intern/cycles/kernel/kernel_emission.h
    branches/asset-browser/intern/cycles/kernel/kernel_passes.h
    branches/asset-browser/intern/cycles/kernel/kernel_path.h
    branches/asset-browser/intern/cycles/kernel/kernel_types.h
    branches/asset-browser/intern/cycles/kernel/svm/svm.h
    branches/asset-browser/intern/cycles/kernel/svm/svm_types.h
    branches/asset-browser/intern/cycles/render/buffers.cpp
    branches/asset-browser/intern/cycles/render/buffers.h
    branches/asset-browser/intern/cycles/render/film.cpp
    branches/asset-browser/intern/cycles/render/film.h
    branches/asset-browser/intern/cycles/render/nodes.cpp
    branches/asset-browser/intern/cycles/render/nodes.h
    branches/asset-browser/intern/cycles/render/svm.cpp
    branches/asset-browser/intern/cycles/render/svm.h
    branches/asset-browser/intern/cycles/subd/subd_dice.h
    branches/asset-browser/intern/cycles/subd/subd_mesh.cpp
    branches/asset-browser/intern/cycles/subd/subd_mesh.h
    branches/asset-browser/intern/cycles/subd/subd_split.h
    branches/asset-browser/intern/cycles/util/util_cuda.h
    branches/asset-browser/intern/cycles/util/util_math.h
    branches/asset-browser/intern/decimation/intern/LOD_QSDecimator.cpp
    branches/asset-browser/intern/ghost/CMakeLists.txt
    branches/asset-browser/intern/ghost/SConscript
    branches/asset-browser/intern/ghost/intern/GHOST_DisplayManager.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_DisplayManagerSDL.h
    branches/asset-browser/intern/ghost/intern/GHOST_DropTargetWin32.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_SystemSDL.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_SystemSDL.h
    branches/asset-browser/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_WindowSDL.h
    branches/asset-browser/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/asset-browser/intern/ghost/intern/GHOST_WindowWin32.h
    branches/asset-browser/release/scripts/modules/addon_utils.py
    branches/asset-browser/release/scripts/modules/bpy/__init__.py
    branches/asset-browser/release/scripts/modules/bpy/path.py
    branches/asset-browser/release/scripts/modules/bpy/utils.py
    branches/asset-browser/release/scripts/modules/bpy_extras/mesh_utils.py
    branches/asset-browser/release/scripts/modules/bpy_types.py
    branches/asset-browser/release/scripts/modules/console_python.py
    branches/asset-browser/release/scripts/modules/rna_xml.py
    branches/asset-browser/release/scripts/presets/interface_theme/back_to_black.xml
    branches/asset-browser/release/scripts/presets/interface_theme/blender_24x.xml
    branches/asset-browser/release/scripts/presets/interface_theme/elsyiun.xml
    branches/asset-browser/release/scripts/presets/interface_theme/hexagon.xml
    branches/asset-browser/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
    branches/asset-browser/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/asset-browser/release/scripts/startup/bl_operators/clip.py
    branches/asset-browser/release/scripts/startup/bl_operators/mesh.py
    branches/asset-browser/release/scripts/startup/bl_operators/object.py
    branches/asset-browser/release/scripts/startup/bl_operators/presets.py
    branches/asset-browser/release/scripts/startup/bl_operators/uvcalc_follow_active.py
    branches/asset-browser/release/scripts/startup/bl_operators/wm.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_game.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_object.py
    branches/asset-browser/release/scripts/startup/bl_ui/properties_particle.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_clip.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_sequencer.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_userpref.py
    branches/asset-browser/release/scripts/startup/bl_ui/space_view3d.py
    branches/asset-browser/release/scripts/templates/operator_mesh_add.py
    branches/asset-browser/release/scripts/templates/ui_panel_simple.py
    branches/asset-browser/source/blender/avi/intern/avi.c
    branches/asset-browser/source/blender/avi/intern/avirgb.c
    branches/asset-browser/source/blender/avi/intern/mjpeg.c
    branches/asset-browser/source/blender/avi/intern/rgb32.c
    branches/asset-browser/source/blender/blenfont/intern/blf_glyph.c
    branches/asset-browser/source/blender/blenfont/intern/blf_lang.c
    branches/asset-browser/source/blender/blenfont/intern/blf_translation.c
    branches/asset-browser/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/asset-browser/source/blender/blenkernel/BKE_animsys.h
    branches/asset-browser/source/blender/blenkernel/BKE_armature.h
    branches/asset-browser/source/blender/blenkernel/BKE_blender.h
    branches/asset-browser/source/blender/blenkernel/BKE_collision.h
    branches/asset-browser/source/blender/blenkernel/BKE_customdata.h
    branches/asset-browser/source/blender/blenkernel/BKE_deform.h
    branches/asset-browser/source/blender/blenkernel/BKE_global.h
    branches/asset-browser/source/blender/blenkernel/BKE_lattice.h
    branches/asset-browser/source/blender/blenkernel/BKE_mesh.h
    branches/asset-browser/source/blender/blenkernel/BKE_modifier.h
    branches/asset-browser/source/blender/blenkernel/BKE_movieclip.h
    branches/asset-browser/source/blender/blenkernel/BKE_sequencer.h
    branches/asset-browser/source/blender/blenkernel/BKE_tessmesh.h
    branches/asset-browser/source/blender/blenkernel/BKE_tracking.h
    branches/asset-browser/source/blender/blenkernel/CMakeLists.txt
    branches/asset-browser/source/blender/blenkernel/intern/DerivedMesh.c
    branches/asset-browser/source/blender/blenkernel/intern/action.c
    branches/asset-browser/source/blender/blenkernel/intern/anim.c
    branches/asset-browser/source/blender/blenkernel/intern/anim_sys.c
    branches/asset-browser/source/blender/blenkernel/intern/armature.c
    branches/asset-browser/source/blender/blenkernel/intern/blender.c
    branches/asset-browser/source/blender/blenkernel/intern/bmfont.c
    branches/asset-browser/source/blender/blenkernel/intern/boids.c
    branches/asset-browser/source/blender/blenkernel/intern/booleanops_mesh.c
    branches/asset-browser/source/blender/blenkernel/intern/brush.c
    branches/asset-browser/source/blender/blenkernel/intern/bvhutils.c
    branches/asset-browser/source/blender/blenkernel/intern/camera.c
    branches/asset-browser/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/asset-browser/source/blender/blenkernel/intern/cloth.c
    branches/asset-browser/source/blender/blenkernel/intern/collision.c
    branches/asset-browser/source/blender/blenkernel/intern/colortools.c
    branches/asset-browser/source/blender/blenkernel/intern/constraint.c
    branches/asset-browser/source/blender/blenkernel/intern/context.c
    branches/asset-browser/source/blender/blenkernel/intern/curve.c
    branches/asset-browser/source/blender/blenkernel/intern/customdata.c
    branches/asset-browser/source/blender/blenkernel/intern/customdata_file.c
    branches/asset-browser/source/blender/blenkernel/intern/deform.c
    branches/asset-browser/source/blender/blenkernel/intern/depsgraph.c
    branches/asset-browser/source/blender/blenkernel/intern/displist.c
    branches/asset-browser/source/blender/blenkernel/intern/dynamicpaint.c
    branches/asset-browser/source/blender/blenkernel/intern/editderivedmesh.c
    branches/asset-browser/source/blender/blenkernel/intern/effect.c
    branches/asset-browser/source/blender/blenkernel/intern/fcurve.c
    branches/asset-browser/source/blender/blenkernel/intern/fluidsim.c
    branches/asset-browser/source/blender/blenkernel/intern/fmodifier.c
    branches/asset-browser/source/blender/blenkernel/intern/font.c
    branches/asset-browser/source/blender/blenkernel/intern/gpencil.c
    branches/asset-browser/source/blender/blenkernel/intern/group.c
    branches/asset-browser/source/blender/blenkernel/intern/icons.c
    branches/asset-browser/source/blender/blenkernel/intern/idprop.c
    branches/asset-browser/source/blender/blenkernel/intern/image.c
    branches/asset-browser/source/blender/blenkernel/intern/image_gen.c
    branches/asset-browser/source/blender/blenkernel/intern/implicit.c
    branches/asset-browser/source/blender/blenkernel/intern/ipo.c
    branches/asset-browser/source/blender/blenkernel/intern/key.c
    branches/asset-browser/source/blender/blenkernel/intern/lamp.c
    branches/asset-browser/source/blender/blenkernel/intern/lattice.c
    branches/asset-browser/source/blender/blenkernel/intern/library.c
    branches/asset-browser/source/blender/blenkernel/intern/material.c
    branches/asset-browser/source/blender/blenkernel/intern/mball.c
    branches/asset-browser/source/blender/blenkernel/intern/mesh.c
    branches/asset-browser/source/blender/blenkernel/intern/mesh_validate.c
    branches/asset-browser/source/blender/blenkernel/intern/modifier.c
    branches/asset-browser/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/asset-browser/source/blender/blenkernel/intern/movieclip.c
    branches/asset-browser/source/blender/blenkernel/intern/multires.c
    branches/asset-browser/source/blender/blenkernel/intern/navmesh_conversion.c
    branches/asset-browser/source/blender/blenkernel/intern/nla.c
    branches/asset-browser/source/blender/blenkernel/intern/node.c
    branches/asset-browser/source/blender/blenkernel/intern/object.c
    branches/asset-browser/source/blender/blenkernel/intern/ocean.c
    branches/asset-browser/source/blender/blenkernel/intern/packedFile.c
    branches/asset-browser/source/blender/blenkernel/intern/paint.c
    branches/asset-browser/source/blender/blenkernel/intern/particle.c
    branches/asset-browser/source/blender/blenkernel/intern/particle_system.c
    branches/asset-browser/source/blender/blenkernel/intern/pointcache.c
    branches/asset-browser/source/blender/blenkernel/intern/property.c
    branches/asset-browser/source/blender/blenkernel/intern/report.c
    branches/asset-browser/source/blender/blenkernel/intern/sca.c
    branches/asset-browser/source/blender/blenkernel/intern/scene.c
    branches/asset-browser/source/blender/blenkernel/intern/screen.c
    branches/asset-browser/source/blender/blenkernel/intern/seqcache.c
    branches/asset-browser/source/blender/blenkernel/intern/seqeffects.c
    branches/asset-browser/source/blender/blenkernel/intern/sequencer.c
    branches/asset-browser/source/blender/blenkernel/intern/shrinkwrap.c
    branches/asset-browser/source/blender/blenkernel/intern/sketch.c
    branches/asset-browser/source/blender/blenkernel/intern/smoke.c
    branches/asset-browser/source/blender/blenkernel/intern/softbody.c
    branches/asset-browser/source/blender/blenkernel/intern/sound.c
    branches/asset-browser/source/blender/blenkernel/intern/speaker.c
    branches/asset-browser/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/asset-browser/source/blender/blenkernel/intern/suggestions.c
    branches/asset-browser/source/blender/blenkernel/intern/text.c
    branches/asset-browser/source/blender/blenkernel/intern/texture.c
    branches/asset-browser/source/blender/blenkernel/intern/tracking.c
    branches/asset-browser/source/blender/blenkernel/intern/world.c
    branches/asset-browser/source/blender/blenkernel/intern/writeavi.c
    branches/asset-browser/source/blender/blenkernel/intern/writeffmpeg.c
    branches/asset-browser/source/blender/blenkernel/intern/writeframeserver.c
    branches/asset-browser/source/blender/blenlib/BLI_fileops.h
    branches/asset-browser/source/blender/blenlib/BLI_math_inline.h
    branches/asset-browser/source/blender/blenlib/BLI_math_matrix.h
    branches/asset-browser/source/blender/blenlib/BLI_math_vector.h
    branches/asset-browser/source/blender/blenlib/BLI_utildefines.h
    branches/asset-browser/source/blender/blenlib/BLI_winstuff.h
    branches/asset-browser/source/blender/blenlib/CMakeLists.txt
    branches/asset-browser/source/blender/blenlib/SConscript
    branches/asset-browser/source/blender/blenlib/intern/BLI_args.c
    branches/asset-browser/source/blender/blenlib/intern/BLI_dynstr.c
    branches/asset-browser/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/asset-browser/source/blender/blenlib/intern/BLI_kdtree.c
    branches/asset-browser/source/blender/blenlib/intern/BLI_linklist.c
    branches/asset-browser/source/blender/blenlib/intern/bpath.c
    branches/asset-browser/source/blender/blenlib/intern/callbacks.c
    branches/asset-browser/source/blender/blenlib/intern/dynlib.c
    branches/asset-browser/source/blender/blenlib/intern/fileops.c
    branches/asset-browser/source/blender/blenlib/intern/freetypefont.c
    branches/asset-browser/source/blender/blenlib/intern/graph.c
    branches/asset-browser/source/blender/blenlib/intern/gsqueue.c
    branches/asset-browser/source/blender/blenlib/intern/jitter.c
    branches/asset-browser/source/blender/blenlib/intern/listbase.c
    branches/asset-browser/source/blender/blenlib/intern/math_base.c
    branches/asset-browser/source/blender/blenlib/intern/math_base_inline.c
    branches/asset-browser/source/blender/blenlib/intern/math_color.c
    branches/asset-browser/source/blender/blenlib/intern/math_color_inline.c
    branches/asset-browser/source/blender/blenlib/intern/math_geom.c
    branches/asset-browser/source/blender/blenlib/intern/math_geom_inline.c
    branches/asset-browser/source/blender/blenlib/intern/math_matrix.c
    branches/asset-browser/source/blender/blenlib/intern/math_rotation.c
    branches/asset-browser/source/blender/blenlib/intern/math_vector.c
    branches/asset-browser/source/blender/blenlib/intern/math_vector_inline.c
    branches/asset-browser/source/blender/blenlib/intern/noise.c
    branches/asset-browser/source/blender/blenlib/intern/path_util.c
    branches/asset-browser/source/blender/blenlib/intern/pbvh.c
    branches/asset-browser/source/blender/blenlib/intern/rand.c
    branches/asset-browser/source/blender/blenlib/intern/scanfill.c
    branches/asset-browser/source/blender/blenlib/intern/storage.c
    branches/asset-browser/source/blender/blenlib/intern/string.c
    branches/asset-browser/source/blender/blenlib/intern/string_utf8.c
    branches/asset-browser/source/blender/blenlib/intern/threads.c
    branches/asset-browser/source/blender/blenlib/intern/time.c
    branches/asset-browser/source/blender/blenlib/intern/voxel.c
    branches/asset-browser/source/blender/blenlib/intern/winstuff.c
    branches/asset-browser/source/blender/blenloader/intern/readblenentry.c
    branches/asset-browser/source/blender/blenloader/intern/readfile.c
    branches/asset-browser/source/blender/blenloader/intern/runtime.c
    branches/asset-browser/source/blender/blenloader/intern/undofile.c
    branches/asset-browser/source/blender/blenloader/intern/writefile.c
    branches/asset-browser/source/blender/blenpluginapi/intern/pluginapi.c
    branches/asset-browser/source/blender/bmesh/CMakeLists.txt
    branches/asset-browser/source/blender/bmesh/bmesh.h
    branches/asset-browser/source/blender/bmesh/bmesh_class.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_construct.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_core.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_core.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_iterators.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_iterators.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_marking.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_marking.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_mods.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_operators.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_operators.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_polygon.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_queries.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_queries.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_structure.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_walkers.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_walkers.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_bevel.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_connect.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_create.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_dissolve.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_dupe.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_edgesplit.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_extrude.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_inset.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_mirror.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_primitive.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_subdivide.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_triangulate.c
    branches/asset-browser/source/blender/bmesh/operators/bmo_utils.c
    branches/asset-browser/source/blender/bmesh/tools/BME_bevel.c
    branches/asset-browser/source/blender/collada/AnimationExporter.cpp
    branches/asset-browser/source/blender/collada/AnimationImporter.cpp
    branches/asset-browser/source/blender/collada/ArmatureExporter.cpp
    branches/asset-browser/source/blender/collada/ArmatureImporter.cpp
    branches/asset-browser/source/blender/collada/DocumentExporter.cpp
    branches/asset-browser/source/blender/collada/DocumentImporter.cpp
    branches/asset-browser/source/blender/collada/EffectExporter.cpp
    branches/asset-browser/source/blender/collada/ExtraHandler.cpp
    branches/asset-browser/source/blender/collada/ExtraTags.cpp
    branches/asset-browser/source/blender/collada/GeometryExporter.cpp
    branches/asset-browser/source/blender/collada/ImageExporter.cpp
    branches/asset-browser/source/blender/collada/InstanceWriter.cpp
    branches/asset-browser/source/blender/collada/LightExporter.cpp
    branches/asset-browser/source/blender/collada/MaterialExporter.cpp
    branches/asset-browser/source/blender/collada/MeshImporter.cpp
    branches/asset-browser/source/blender/collada/SceneExporter.cpp
    branches/asset-browser/source/blender/collada/TransformWriter.cpp
    branches/asset-browser/source/blender/collada/collada.cpp
    branches/asset-browser/source/blender/collada/collada_internal.cpp
    branches/asset-browser/source/blender/collada/collada_utils.cpp
    branches/asset-browser/source/blender/editors/animation/anim_channels_defines.c
    branches/asset-browser/source/blender/editors/animation/anim_channels_edit.c
    branches/asset-browser/source/blender/editors/animation/anim_deps.c
    branches/asset-browser/source/blender/editors/animation/anim_filter.c
    branches/asset-browser/source/blender/editors/animation/anim_ipo_utils.c
    branches/asset-browser/source/blender/editors/animation/anim_markers.c
    branches/asset-browser/source/blender/editors/animation/anim_ops.c
    branches/asset-browser/source/blender/editors/animation/drivers.c
    branches/asset-browser/source/blender/editors/animation/fmodifier_ui.c
    branches/asset-browser/source/blender/editors/animation/keyframes_draw.c
    branches/asset-browser/source/blender/editors/animation/keyframes_edit.c
    branches/asset-browser/source/blender/editors/animation/keyframes_general.c
    branches/asset-browser/source/blender/editors/animation/keyframing.c
    branches/asset-browser/source/blender/editors/animation/keyingsets.c
    branches/asset-browser/source/blender/editors/armature/armature_ops.c
    branches/asset-browser/source/blender/editors/armature/editarmature.c
    branches/asset-browser/source/blender/editors/armature/editarmature_retarget.c
    branches/asset-browser/source/blender/editors/armature/editarmature_sketch.c
    branches/asset-browser/source/blender/editors/armature/meshlaplacian.c
    branches/asset-browser/source/blender/editors/armature/poseSlide.c
    branches/asset-browser/source/blender/editors/armature/poselib.c
    branches/asset-browser/source/blender/editors/armature/poseobject.c
    branches/asset-browser/source/blender/editors/armature/reeb.c
    branches/asset-browser/source/blender/editors/curve/curve_ops.c
    branches/asset-browser/source/blender/editors/curve/editcurve.c
    branches/asset-browser/source/blender/editors/curve/editfont.c
    branches/asset-browser/source/blender/editors/datafiles/startup.blend.c
    branches/asset-browser/source/blender/editors/gpencil/drawgpencil.c
    branches/asset-browser/source/blender/editors/gpencil/editaction_gpencil.c
    branches/asset-browser/source/blender/editors/gpencil/gpencil_buttons.c
    branches/asset-browser/source/blender/editors/gpencil/gpencil_edit.c
    branches/asset-browser/source/blender/editors/gpencil/gpencil_ops.c
    branches/asset-browser/source/blender/editors/gpencil/gpencil_paint.c
    branches/asset-browser/source/blender/editors/gpencil/gpencil_undo.c
    branches/asset-browser/source/blender/editors/include/BIF_glutil.h
    branches/asset-browser/source/blender/editors/include/ED_mesh.h
    branches/asset-browser/source/blender/editors/include/UI_resources.h
    branches/asset-browser/source/blender/editors/interface/interface.c
    branches/asset-browser/source/blender/editors/interface/interface_anim.c
    branches/asset-browser/source/blender/editors/interface/interface_draw.c
    branches/asset-browser/source/blender/editors/interface/interface_handlers.c
    branches/asset-browser/source/blender/editors/interface/interface_icons.c
    branches/asset-browser/source/blender/editors/interface/interface_intern.h
    branches/asset-browser/source/blender/editors/interface/interface_layout.c
    branches/asset-browser/source/blender/editors/interface/interface_ops.c
    branches/asset-browser/source/blender/editors/interface/interface_panel.c
    branches/asset-browser/source/blender/editors/interface/interface_regions.c
    branches/asset-browser/source/blender/editors/interface/interface_style.c
    branches/asset-browser/source/blender/editors/interface/interface_templates.c
    branches/asset-browser/source/blender/editors/interface/interface_utils.c
    branches/asset-browser/source/blender/editors/interface/interface_widgets.c
    branches/asset-browser/source/blender/editors/interface/resources.c
    branches/asset-browser/source/blender/editors/interface/view2d.c
    branches/asset-browser/source/blender/editors/interface/view2d_ops.c
    branches/asset-browser/source/blender/editors/mesh/CMakeLists.txt
    branches/asset-browser/source/blender/editors/mesh/editface.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_add.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_bvh.c
    branches/asset-browser/source/blender/editors/mesh/mesh_data.c
    branches/asset-browser/source/blender/editors/mesh/mesh_intern.h
    branches/asset-browser/source/blender/editors/mesh/mesh_navmesh.c
    branches/asset-browser/source/blender/editors/mesh/mesh_ops.c
    branches/asset-browser/source/blender/editors/mesh/meshtools.c
    branches/asset-browser/source/blender/editors/metaball/mball_edit.c
    branches/asset-browser/source/blender/editors/metaball/mball_ops.c
    branches/asset-browser/source/blender/editors/object/object_add.c
    branches/asset-browser/source/blender/editors/object/object_bake.c
    branches/asset-browser/source/blender/editors/object/object_constraint.c
    branches/asset-browser/source/blender/editors/object/object_edit.c
    branches/asset-browser/source/blender/editors/object/object_group.c
    branches/asset-browser/source/blender/editors/object/object_hook.c
    branches/asset-browser/source/blender/editors/object/object_lattice.c
    branches/asset-browser/source/blender/editors/object/object_modifier.c
    branches/asset-browser/source/blender/editors/object/object_ops.c
    branches/asset-browser/source/blender/editors/object/object_relations.c
    branches/asset-browser/source/blender/editors/object/object_select.c
    branches/asset-browser/source/blender/editors/object/object_shapekey.c
    branches/asset-browser/source/blender/editors/object/object_transform.c
    branches/asset-browser/source/blender/editors/object/object_vgroup.c
    branches/asset-browser/source/blender/editors/physics/dynamicpaint_ops.c
    branches/asset-browser/source/blender/editors/physics/particle_boids.c
    branches/asset-browser/source/blender/editors/physics/particle_edit.c
    branches/asset-browser/source/blender/editors/physics/particle_object.c
    branches/asset-browser/source/blender/editors/physics/physics_fluid.c
    branches/asset-browser/source/blender/editors/physics/physics_ops.c
    branches/asset-browser/source/blender/editors/physics/physics_pointcache.c
    branches/asset-browser/source/blender/editors/render/render_internal.c
    branches/asset-browser/source/blender/editors/render/render_opengl.c
    branches/asset-browser/source/blender/editors/render/render_preview.c
    branches/asset-browser/source/blender/editors/render/render_shading.c
    branches/asset-browser/source/blender/editors/render/render_update.c
    branches/asset-browser/source/blender/editors/render/render_view.c
    branches/asset-browser/source/blender/editors/screen/area.c
    branches/asset-browser/source/blender/editors/screen/glutil.c
    branches/asset-browser/source/blender/editors/screen/screen_context.c
    branches/asset-browser/source/blender/editors/screen/screen_edit.c
    branches/asset-browser/source/blender/editors/screen/screen_ops.c
    branches/asset-browser/source/blender/editors/screen/screendump.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_hide.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_image.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_intern.h
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_ops.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_undo.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_utils.c
    branches/asset-browser/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/asset-browser/source/blender/editors/sculpt_paint/sculpt.c
    branches/asset-browser/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/asset-browser/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/asset-browser/source/blender/editors/sound/sound_ops.c
    branches/asset-browser/source/blender/editors/space_action/action_draw.c
    branches/asset-browser/source/blender/editors/space_action/action_edit.c
    branches/asset-browser/source/blender/editors/space_action/action_ops.c
    branches/asset-browser/source/blender/editors/space_action/action_select.c
    branches/asset-browser/source/blender/editors/space_action/space_action.c
    branches/asset-browser/source/blender/editors/space_api/spacetypes.c
    branches/asset-browser/source/blender/editors/space_buttons/buttons_context.c
    branches/asset-browser/source/blender/editors/space_buttons/buttons_header.c
    branches/asset-browser/source/blender/editors/space_buttons/buttons_ops.c
    branches/asset-browser/source/blender/editors/space_buttons/buttons_texture.c
    branches/asset-browser/source/blender/editors/space_buttons/space_buttons.c
    branches/asset-browser/source/blender/editors/space_clip/clip_buttons.c
    branches/asset-browser/source/blender/editors/space_clip/clip_draw.c
    branches/asset-browser/source/blender/editors/space_clip/clip_editor.c
    branches/asset-browser/source/blender/editors/space_clip/clip_graph_draw.c
    branches/asset-browser/source/blender/editors/space_clip/clip_graph_ops.c
    branches/asset-browser/source/blender/editors/space_clip/clip_intern.h
    branches/asset-browser/source/blender/editors/space_clip/clip_ops.c
    branches/asset-browser/source/blender/editors/space_clip/clip_toolbar.c
    branches/asset-browser/source/blender/editors/space_clip/clip_utils.c
    branches/asset-browser/source/blender/editors/space_clip/space_clip.c
    branches/asset-browser/source/blender/editors/space_clip/tracking_ops.c
    branches/asset-browser/source/blender/editors/space_console/console_draw.c
    branches/asset-browser/source/blender/editors/space_console/console_ops.c
    branches/asset-browser/source/blender/editors/space_console/space_console.c
    branches/asset-browser/source/blender/editors/space_file/file_draw.c
    branches/asset-browser/source/blender/editors/space_file/file_ops.c
    branches/asset-browser/source/blender/editors/space_file/file_panels.c
    branches/asset-browser/source/blender/editors/space_file/filelist.c
    branches/asset-browser/source/blender/editors/space_file/filesel.c
    branches/asset-browser/source/blender/editors/space_file/fsmenu.c
    branches/asset-browser/source/blender/editors/space_file/space_file.c
    branches/asset-browser/source/blender/editors/space_graph/graph_buttons.c
    branches/asset-browser/source/blender/editors/space_graph/graph_draw.c
    branches/asset-browser/source/blender/editors/space_graph/graph_edit.c
    branches/asset-browser/source/blender/editors/space_graph/graph_ops.c
    branches/asset-browser/source/blender/editors/space_graph/graph_select.c
    branches/asset-browser/source/blender/editors/space_graph/space_graph.c
    branches/asset-browser/source/blender/editors/space_image/image_buttons.c
    branches/asset-browser/source/blender/editors/space_image/image_draw.c
    branches/asset-browser/source/blender/editors/space_image/image_ops.c
    branches/asset-browser/source/blender/editors/space_image/space_image.c
    branches/asset-browser/source/blender/editors/space_info/info_draw.c
    branches/asset-browser/source/blender/editors/space_info/info_ops.c
    branches/asset-browser/source/blender/editors/space_info/info_report.c
    branches/asset-browser/source/blender/editors/space_info/info_stats.c
    branches/asset-browser/source/blender/editors/space_info/space_info.c
    branches/asset-browser/source/blender/editors/space_info/textview.c
    branches/asset-browser/source/blender/editors/space_logic/logic_buttons.c
    branches/asset-browser/source/blender/editors/space_logic/logic_ops.c
    branches/asset-browser/source/blender/editors/space_logic/logic_window.c
    branches/asset-browser/source/blender/editors/space_logic/space_logic.c
    branches/asset-browser/source/blender/editors/space_nla/nla_buttons.c
    branches/asset-browser/source/blender/editors/space_nla/nla_channels.c
    branches/asset-browser/source/blender/editors/space_nla/nla_draw.c
    branches/asset-browser/source/blender/editors/space_nla/nla_edit.c
    branches/asset-browser/source/blender/editors/space_nla/nla_ops.c
    branches/asset-browser/source/blender/editors/space_nla/nla_select.c
    branches/asset-browser/source/blender/editors/space_nla/space_nla.c
    branches/asset-browser/source/blender/editors/space_node/drawnode.c
    branches/asset-browser/source/blender/editors/space_node/node_buttons.c
    branches/asset-browser/source/blender/editors/space_node/node_draw.c
    branches/asset-browser/source/blender/editors/space_node/node_edit.c
    branches/asset-browser/source/blender/editors/space_node/node_header.c
    branches/asset-browser/source/blender/editors/space_node/node_ops.c
    branches/asset-browser/source/blender/editors/space_node/node_select.c
    branches/asset-browser/source/blender/editors/space_node/node_state.c
    branches/asset-browser/source/blender/editors/space_node/node_templates.c
    branches/asset-browser/source/blender/editors/space_node/space_node.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_draw.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_edit.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_ops.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_select.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_tools.c
    branches/asset-browser/source/blender/editors/space_outliner/outliner_tree.c
    branches/asset-browser/source/blender/editors/space_outliner/space_outliner.c
    branches/asset-browser/source/blender/editors/space_script/script_edit.c
    branches/asset-browser/source/blender/editors/space_script/script_ops.c
    branches/asset-browser/source/blender/editors/space_script/space_script.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_add.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_scopes.c
    branches/asset-browser/source/blender/editors/space_sequencer/sequencer_select.c
    branches/asset-browser/source/blender/editors/space_sequencer/space_sequencer.c
    branches/asset-browser/source/blender/editors/space_text/space_text.c
    branches/asset-browser/source/blender/editors/space_text/text_draw.c
    branches/asset-browser/source/blender/editors/space_text/text_header.c
    branches/asset-browser/source/blender/editors/space_text/text_ops.c
    branches/asset-browser/source/blender/editors/space_text/text_python.c
    branches/asset-browser/source/blender/editors/space_time/space_time.c
    branches/asset-browser/source/blender/editors/space_time/time_ops.c
    branches/asset-browser/source/blender/editors/space_view3d/drawanimviz.c
    branches/asset-browser/source/blender/editors/space_view3d/drawarmature.c
    branches/asset-browser/source/blender/editors/space_view3d/drawmesh.c
    branches/asset-browser/source/blender/editors/space_view3d/drawobject.c
    branches/asset-browser/source/blender/editors/space_view3d/drawvolume.c
    branches/asset-browser/source/blender/editors/space_view3d/space_view3d.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_buttons.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_draw.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_edit.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_fly.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_header.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_ops.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_select.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_snap.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/asset-browser/source/blender/editors/space_view3d/view3d_view.c
    branches/asset-browser/source/blender/editors/transform/transform.c
    branches/asset-browser/source/blender/editors/transform/transform_constraints.c
    branches/asset-browser/source/blender/editors/transform/transform_conversions.c
    branches/asset-browser/source/blender/editors/transform/transform_generics.c
    branches/asset-browser/source/blender/editors/transform/transform_input.c
    branches/asset-browser/source/blender/editors/transform/transform_manipulator.c
    branches/asset-browser/source/blender/editors/transform/transform_ops.c
    branches/asset-browser/source/blender/editors/transform/transform_orientations.c
    branches/asset-browser/source/blender/editors/transform/transform_snap.c
    branches/asset-browser/source/blender/editors/util/crazyspace.c
    branches/asset-browser/source/blender/editors/util/ed_util.c
    branches/asset-browser/source/blender/editors/util/editmode_undo.c
    branches/asset-browser/source/blender/editors/util/numinput.c
    branches/asset-browser/source/blender/editors/util/undo.c
    branches/asset-browser/source/blender/editors/uvedit/uvedit_buttons.c
    branches/asset-browser/source/blender/editors/uvedit/uvedit_draw.c
    branches/asset-browser/source/blender/editors/uvedit/uvedit_intern.h
    branches/asset-browser/source/blender/editors/uvedit/uvedit_ops.c
    branches/asset-browser/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/asset-browser/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/asset-browser/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/asset-browser/source/blender/gpu/intern/gpu_buffers.c
    branches/asset-browser/source/blender/gpu/intern/gpu_codegen.c
    branches/asset-browser/source/blender/gpu/intern/gpu_draw.c
    branches/asset-browser/source/blender/gpu/intern/gpu_extensions.c
    branches/asset-browser/source/blender/gpu/intern/gpu_material.c
    branches/asset-browser/source/blender/ikplugin/intern/iksolver_plugin.c
    branches/asset-browser/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/asset-browser/source/blender/imbuf/CMakeLists.txt
    branches/asset-browser/source/blender/imbuf/SConscript
    branches/asset-browser/source/blender/imbuf/intern/allocimbuf.c
    branches/asset-browser/source/blender/imbuf/intern/anim_movie.c
    branches/asset-browser/source/blender/imbuf/intern/bmp.c
    branches/asset-browser/source/blender/imbuf/intern/cache.c
    branches/asset-browser/source/blender/imbuf/intern/cineon/cineon_dpx.c
    branches/asset-browser/source/blender/imbuf/intern/cineon/cineonlib.c
    branches/asset-browser/source/blender/imbuf/intern/cineon/dpxlib.c
    branches/asset-browser/source/blender/imbuf/intern/cineon/logImageLib.c
    branches/asset-browser/source/blender/imbuf/intern/cineon/logmemfile.c
    branches/asset-browser/source/blender/imbuf/intern/dds/BlockDXT.cpp
    branches/asset-browser/source/blender/imbuf/intern/dds/ColorBlock.cpp
    branches/asset-browser/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
    branches/asset-browser/source/blender/imbuf/intern/dds/dds_api.cpp
    branches/asset-browser/source/blender/imbuf/intern/divers.c
    branches/asset-browser/source/blender/imbuf/intern/filetype.c
    branches/asset-browser/source/blender/imbuf/intern/filter.c
    branches/asset-browser/source/blender/imbuf/intern/imageprocess.c
    branches/asset-browser/source/blender/imbuf/intern/indexer.c
    branches/asset-browser/source/blender/imbuf/intern/indexer_dv.c
    branches/asset-browser/source/blender/imbuf/intern/iris.c
    branches/asset-browser/source/blender/imbuf/intern/jp2.c
    branches/asset-browser/source/blender/imbuf/intern/jpeg.c
    branches/asset-browser/source/blender/imbuf/intern/metadata.c
    branches/asset-browser/source/blender/imbuf/intern/moviecache.c
    branches/asset-browser/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/asset-browser/source/blender/imbuf/intern/png.c
    branches/asset-browser/source/blender/imbuf/intern/radiance_hdr.c
    branches/asset-browser/source/blender/imbuf/intern/readimage.c
    branches/asset-browser/source/blender/imbuf/intern/rectop.c
    branches/asset-browser/source/blender/imbuf/intern/rotate.c
    branches/asset-browser/source/blender/imbuf/intern/scaling.c
    branches/asset-browser/source/blender/imbuf/intern/targa.c
    branches/asset-browser/source/blender/imbuf/intern/thumbs.c
    branches/asset-browser/source/blender/imbuf/intern/thumbs_blend.c
    branches/asset-browser/source/blender/imbuf/intern/tiff.c
    branches/asset-browser/source/blender/imbuf/intern/util.c
    branches/asset-browser/source/blender/imbuf/intern/writeimage.c
    branches/asset-browser/source/blender/makesdna/DNA_action_types.h
    branches/asset-browser/source/blender/makesdna/DNA_customdata_types.h
    branches/asset-browser/source/blender/makesdna/DNA_modifier_types.h
    branches/asset-browser/source/blender/makesdna/DNA_movieclip_types.h
    branches/asset-browser/source/blender/makesdna/DNA_object_types.h
    branches/asset-browser/source/blender/makesdna/DNA_particle_types.h
    branches/asset-browser/source/blender/makesdna/DNA_sequence_types.h
    branches/asset-browser/source/blender/makesdna/DNA_space_types.h
    branches/asset-browser/source/blender/makesdna/DNA_userdef_types.h
    branches/asset-browser/source/blender/makesdna/intern/dna_genfile.c
    branches/asset-browser/source/blender/makesdna/intern/makesdna.c
    branches/asset-browser/source/blender/makesrna/RNA_access.h
    branches/asset-browser/source/blender/makesrna/RNA_enum_types.h
    branches/asset-browser/source/blender/makesrna/intern/makesrna.c
    branches/asset-browser/source/blender/makesrna/intern/rna_access.c
    branches/asset-browser/source/blender/makesrna/intern/rna_action.c
    branches/asset-browser/source/blender/makesrna/intern/rna_actuator.c
    branches/asset-browser/source/blender/makesrna/intern/rna_animation.c
    branches/asset-browser/source/blender/makesrna/intern/rna_armature.c
    branches/asset-browser/source/blender/makesrna/intern/rna_boid.c
    branches/asset-browser/source/blender/makesrna/intern/rna_color.c
    branches/asset-browser/source/blender/makesrna/intern/rna_constraint.c
    branches/asset-browser/source/blender/makesrna/intern/rna_curve.c
    branches/asset-browser/source/blender/makesrna/intern/rna_define.c
    branches/asset-browser/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/asset-browser/source/blender/makesrna/intern/rna_fcurve.c
    branches/asset-browser/source/blender/makesrna/intern/rna_image.c
    branches/asset-browser/source/blender/makesrna/intern/rna_image_api.c
    branches/asset-browser/source/blender/makesrna/intern/rna_internal_types.h
    branches/asset-browser/source/blender/makesrna/intern/rna_key.c
    branches/asset-browser/source/blender/makesrna/intern/rna_material.c
    branches/asset-browser/source/blender/makesrna/intern/rna_mesh.c
    branches/asset-browser/source/blender/makesrna/intern/rna_mesh_api.c
    branches/asset-browser/source/blender/makesrna/intern/rna_mesh_utils.h
    branches/asset-browser/source/blender/makesrna/intern/rna_modifier.c
    branches/asset-browser/source/blender/makesrna/intern/rna_nodetree.c
    branches/asset-browser/source/blender/makesrna/intern/rna_object.c
    branches/asset-browser/source/blender/makesrna/intern/rna_object_api.c
    branches/asset-browser/source/blender/makesrna/intern/rna_object_force.c
    branches/asset-browser/source/blender/makesrna/intern/rna_particle.c
    branches/asset-browser/source/blender/makesrna/intern/rna_pose.c
    branches/asset-browser/source/blender/makesrna/intern/rna_property.c
    branches/asset-browser/source/blender/makesrna/intern/rna_scene.c
    branches/asset-browser/source/blender/makesrna/intern/rna_screen.c
    branches/asset-browser/source/blender/makesrna/intern/rna_sensor.c
    branches/asset-browser/source/blender/makesrna/intern/rna_sequencer.c
    branches/asset-browser/source/blender/makesrna/intern/rna_space.c
    branches/asset-browser/source/blender/makesrna/intern/rna_tracking.c
    branches/asset-browser/source/blender/makesrna/intern/rna_userdef.c
    branches/asset-browser/source/blender/makesrna/intern/rna_wm_api.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_armature.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_array.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_bevel.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_boolean.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_build.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_cast.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_cloth.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_collision.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_curve.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_decimate.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_displace.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_dynamicpaint.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_explode.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_fluidsim.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_fluidsim_util.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_hook.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_lattice.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_mask.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_mirror.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_multires.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_ocean.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_particlesystem.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_remesh.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_screw.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_shapekey.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_shrinkwrap.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_smoke.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_smooth.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_solidify.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_subsurf.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_surface.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_util.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_uvproject.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_warp.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_wave.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_weightvgedit.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_weightvgmix.c
    branches/asset-browser/source/blender/modifiers/intern/MOD_weightvgproximity.c
    branches/asset-browser/source/blender/nodes/composite/node_composite_tree.c
    branches/asset-browser/source/blender/nodes/composite/node_composite_util.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_blur.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_brightness.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_composite.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_crop.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_curves.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_defocus.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_dilate.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_displace.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_filter.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_flip.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_gamma.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_glare.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_idMask.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_image.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_invert.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_levels.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_mapUV.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_math.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_normal.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_normalize.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_premulkey.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_rotate.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_scale.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_setalpha.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_texture.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_tonemap.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_transform.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_translate.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_viewer.c
    branches/asset-browser/source/blender/nodes/composite/nodes/node_composite_zcombine.c
    branches/asset-browser/source/blender/nodes/intern/node_common.c
    branches/asset-browser/source/blender/nodes/intern/node_exec.c
    branches/asset-browser/source/blender/nodes/intern/node_socket.c
    branches/asset-browser/source/blender/nodes/intern/node_util.c
    branches/asset-browser/source/blender/nodes/shader/node_shader_tree.c
    branches/asset-browser/source/blender/nodes/shader/node_shader_util.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_camera.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_curves.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_dynamic.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_output.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/asset-browser/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/asset-browser/source/blender/nodes/texture/node_texture_tree.c
    branches/asset-browser/source/blender/nodes/texture/node_texture_util.c
    branches/asset-browser/source/blender/nodes/texture/nodes/node_texture_bricks.c
    branches/asset-browser/source/blender/nodes/texture/nodes/node_texture_checker.c
    branches/asset-browser/source/blender/nodes/texture/nodes/node_texture_compose.c
    branches/asset-browser/source/blender/nodes/texture/nodes/node_texture_curves.c
    branches/asset-browser/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
    branches/asset-browser/source/blender/nodes/texture/nodes/node_texture_image.c
    branches/asset-browser/source/blender/nodes/texture/nodes/node_texture_math.c
    branches/asset-browser/source/blender/nodes/texture/nodes/node_texture_output.c
    branches/asset-browser/source/blender/nodes/texture/nodes/node_texture_proc.c
    branches/asset-browser/source/blender/nodes/texture/nodes/node_texture_texture.c
    branches/asset-browser/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
    branches/asset-browser/source/blender/nodes/texture/nodes/node_texture_viewer.c
    branches/asset-browser/source/blender/python/bmesh/bmesh_py_api.c
    branches/asset-browser/source/blender/python/bmesh/bmesh_py_types.c
    branches/asset-browser/source/blender/python/bmesh/bmesh_py_types_customdata.c
    branches/asset-browser/source/blender/python/bmesh/bmesh_py_types_customdata.h
    branches/asset-browser/source/blender/python/bmesh/bmesh_py_types_meshdata.c
    branches/asset-browser/source/blender/python/bmesh/bmesh_py_types_meshdata.h
    branches/asset-browser/source/blender/python/bmesh/bmesh_py_types_select.c
    branches/asset-browser/source/blender/python/bmesh/bmesh_py_utils.c
    branches/asset-browser/source/blender/python/generic/bgl.c
    branches/asset-browser/source/blender/python/generic/bgl.h
    branches/asset-browser/source/blender/python/generic/bpy_internal_import.c
    branches/asset-browser/source/blender/python/generic/idprop_py_api.c
    branches/asset-browser/source/blender/python/generic/py_capi_utils.c
    branches/asset-browser/source/blender/python/intern/bpy.c
    branches/asset-browser/source/blender/python/intern/bpy_app.c
    branches/asset-browser/source/blender/python/intern/bpy_app_ffmpeg.c
    branches/asset-browser/source/blender/python/intern/bpy_app_handlers.c
    branches/asset-browser/source/blender/python/intern/bpy_interface.c
    branches/asset-browser/source/blender/python/intern/bpy_library.c
    branches/asset-browser/source/blender/python/intern/bpy_operator.c
    branches/asset-browser/source/blender/python/intern/bpy_operator_wrap.c
    branches/asset-browser/source/blender/python/intern/bpy_props.c
    branches/asset-browser/source/blender/python/intern/bpy_rna.c
    branches/asset-browser/source/blender/python/intern/bpy_rna_anim.c
    branches/asset-browser/source/blender/python/intern/bpy_rna_array.c
    branches/asset-browser/source/blender/python/intern/bpy_traceback.c
    branches/asset-browser/source/blender/python/intern/bpy_util.c
    branches/asset-browser/source/blender/python/intern/gpu.c
    branches/asset-browser/source/blender/python/mathutils/mathutils.c
    branches/asset-browser/source/blender/python/mathutils/mathutils.h
    branches/asset-browser/source/blender/python/mathutils/mathutils_Color.c
    branches/asset-browser/source/blender/python/mathutils/mathutils_Euler.c
    branches/asset-browser/source/blender/python/mathutils/mathutils_Matrix.c
    branches/asset-browser/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/asset-browser/source/blender/python/mathutils/mathutils_Vector.c
    branches/asset-browser/source/blender/python/mathutils/mathutils_geometry.c
    branches/asset-browser/source/blender/python/mathutils/mathutils_noise.c
    branches/asset-browser/source/blender/quicktime/apple/qtkit_export.m
    branches/asset-browser/source/blender/quicktime/apple/quicktime_export.c
    branches/asset-browser/source/blender/quicktime/apple/quicktime_import.c
    branches/asset-browser/source/blender/render/extern/include/RE_pipeline.h
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject_blibvh.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject_empty.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject_instance.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/asset-browser/source/blender/render/intern/raytrace/reorganize.h
    branches/asset-browser/source/blender/render/intern/raytrace/svbvh.h
    branches/asset-browser/source/blender/render/intern/raytrace/vbvh.h
    branches/asset-browser/source/blender/render/intern/source/convertblender.c
    branches/asset-browser/source/blender/render/intern/source/envmap.c
    branches/asset-browser/source/blender/render/intern/source/external_engine.c
    branches/asset-browser/source/blender/render/intern/source/imagetexture.c
    branches/asset-browser/source/blender/render/intern/source/initrender.c
    branches/asset-browser/source/blender/render/intern/source/occlusion.c
    branches/asset-browser/source/blender/render/intern/source/pipeline.c
    branches/asset-browser/source/blender/render/intern/source/pixelblending.c
    branches/asset-browser/source/blender/render/intern/source/pixelshading.c
    branches/asset-browser/source/blender/render/intern/source/pointdensity.c
    branches/asset-browser/source/blender/render/intern/source/rayshade.c
    branches/asset-browser/source/blender/render/intern/source/render_result.c
    branches/asset-browser/source/blender/render/intern/source/render_texture.c
    branches/asset-browser/source/blender/render/intern/source/rendercore.c
    branches/asset-browser/source/blender/render/intern/source/renderdatabase.c
    branches/asset-browser/source/blender/render/intern/source/shadbuf.c
    branches/asset-browser/source/blender/render/intern/source/shadeinput.c
    branches/asset-browser/source/blender/render/intern/source/shadeoutput.c
    branches/asset-browser/source/blender/render/intern/source/sss.c
    branches/asset-browser/source/blender/render/intern/source/strand.c
    branches/asset-browser/source/blender/render/intern/source/sunsky.c
    branches/asset-browser/source/blender/render/intern/source/volume_precache.c
    branches/asset-browser/source/blender/render/intern/source/volumetric.c
    branches/asset-browser/source/blender/render/intern/source/voxeldata.c
    branches/asset-browser/source/blender/render/intern/source/zbuf.c
    branches/asset-browser/source/blender/windowmanager/CMakeLists.txt
    branches/asset-browser/source/blender/windowmanager/SConscript
    branches/asset-browser/source/blender/windowmanager/WM_api.h
    branches/asset-browser/source/blender/windowmanager/WM_types.h
    branches/asset-browser/source/blender/windowmanager/intern/wm.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_apple.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_cursors.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_draw.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_event_system.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_files.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_gesture.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_init_exit.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_jobs.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_keymap.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_operators.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_subwindow.c
    branches/asset-browser/source/blender/windowmanager/intern/wm_window.c
    branches/asset-browser/source/blenderplayer/CMakeLists.txt
    branches/asset-browser/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/asset-browser/source/creator/CMakeLists.txt
    branches/asset-browser/source/creator/creator.c
    branches/asset-browser/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/asset-browser/source/gameengine/BlenderRoutines/BL_System.cpp
    branches/asset-browser/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/asset-browser/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/asset-browser/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
    branches/asset-browser/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/asset-browser/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/asset-browser/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/asset-browser/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/asset-browser/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/asset-browser/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/asset-browser/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/asset-browser/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/asset-browser/source/gameengine/Converter/BlenderWorldInfo.cpp
    branches/asset-browser/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
    branches/asset-browser/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/asset-browser/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/asset-browser/source/gameengine/Converter/KX_ConvertControllers.cpp
    branches/asset-browser/source/gameengine/Converter/KX_ConvertProperties.cpp
    branches/asset-browser/source/gameengine/Converter/KX_IpoConvert.cpp
    branches/asset-browser/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
    branches/asset-browser/source/gameengine/Expressions/ErrorValue.cpp
    branches/asset-browser/source/gameengine/Expressions/Expression.cpp
    branches/asset-browser/source/gameengine/Expressions/InputParser.cpp
    branches/asset-browser/source/gameengine/Expressions/IntValue.cpp
    branches/asset-browser/source/gameengine/Expressions/ListValue.cpp
    branches/asset-browser/source/gameengine/Expressions/Operator2Expr.cpp
    branches/asset-browser/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/asset-browser/source/gameengine/Expressions/Value.cpp
    branches/asset-browser/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/asset-browser/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_IInputDevice.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_JoystickManager.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_LogicManager.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/asset-browser/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/asset-browser/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
    branches/asset-browser/source/gameengine/GamePlayer/common/GPC_Engine.cpp
    branches/asset-browser/source/gameengine/GamePlayer/common/GPC_RawImage.cpp
    branches/asset-browser/source/gameengine/GamePlayer/common/GPC_RawLoadDotBlendArray.cpp
    branches/asset-browser/source/gameengine/GamePlayer/common/GPC_RawLogoArrays.cpp
    branches/asset-browser/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/asset-browser/source/gameengine/GamePlayer/common/bmfont.cpp
    branches/asset-browser/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/asset-browser/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/asset-browser/source/gameengine/GamePlayer/xembed/UnixShell.c
    branches/asset-browser/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
    branches/asset-browser/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/asset-browser/source/gameengine/Ketsji/BL_Material.cpp
    branches/asset-browser/source/gameengine/Ketsji/BL_Shader.cpp
    branches/asset-browser/source/gameengine/Ketsji/BL_Texture.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_Camera.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_Dome.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_Dome.h
    branches/asset-browser/source/gameengine/Ketsji/KX_FontObject.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_Light.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_NavMeshObject.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_PyMath.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_PythonSeq.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_RayCast.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_Scene.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_SteeringActuator.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/asset-browser/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/asset-browser/source/gameengine/Physics/Bullet/CcdGraphicController.cpp
    branches/asset-browser/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/asset-browser/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/asset-browser/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/asset-browser/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/asset-browser/source/gameengine/Rasterizer/RAS_FramingManager.cpp
    branches/asset-browser/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
    branches/asset-browser/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/asset-browser/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/asset-browser/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
    branches/asset-browser/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/asset-browser/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/asset-browser/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    branches/asset-browser/source/gameengine/Rasterizer/RAS_Polygon.cpp
    branches/asset-browser/source/gameengine/SceneGraph/SG_Controller.cpp
    branches/asset-browser/source/gameengine/SceneGraph/SG_IObject.cpp
    branches/asset-browser/source/gameengine/SceneGraph/SG_Node.cpp
    branches/asset-browser/source/gameengine/SceneGraph/SG_Spatial.cpp
    branches/asset-browser/source/gameengine/SceneGraph/SG_Tree.cpp
    branches/asset-browser/source/gameengine/VideoTexture/ImageRender.cpp
    branches/asset-browser/source/gameengine/VideoTexture/VideoFFmpeg.cpp
    branches/asset-browser/source/gameengine/VideoTexture/blendVideoTex.cpp

Added Paths:
-----------
    branches/asset-browser/extern/eltopo/common/array2_utils.h
    branches/asset-browser/extern/eltopo/common/ccd_defs.h
    branches/asset-browser/extern/eltopo/common/commonoptions.h
    branches/asset-browser/extern/eltopo/common/lexer.cpp
    branches/asset-browser/extern/eltopo/common/lexer.h
    branches/asset-browser/extern/eltopo/common/marching_tiles_hires.cpp
    branches/asset-browser/extern/eltopo/common/marching_tiles_hires.h
    branches/asset-browser/extern/eltopo/common/newparser.cpp
    branches/asset-browser/extern/eltopo/common/newparser.h
    branches/asset-browser/extern/eltopo/common/runstats.cpp
    branches/asset-browser/extern/eltopo/common/runstats.h
    branches/asset-browser/extern/eltopo/eltopo3d/collisionpipeline.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/collisionpipeline.h
    branches/asset-browser/extern/eltopo/eltopo3d/cpp-file-template.txt
    branches/asset-browser/extern/eltopo/eltopo3d/edgecollapser.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/edgecollapser.h
    branches/asset-browser/extern/eltopo/eltopo3d/edgeflipper.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/edgeflipper.h
    branches/asset-browser/extern/eltopo/eltopo3d/edgesplitter.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/edgesplitter.h
    branches/asset-browser/extern/eltopo/eltopo3d/h-file-template.txt
    branches/asset-browser/extern/eltopo/eltopo3d/impactzonesolver.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/impactzonesolver.h
    branches/asset-browser/extern/eltopo/eltopo3d/meshmerger.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/meshmerger.h
    branches/asset-browser/extern/eltopo/eltopo3d/meshpincher.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/meshpincher.h
    branches/asset-browser/extern/eltopo/eltopo3d/meshrenderer.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/meshrenderer.h
    branches/asset-browser/extern/eltopo/eltopo3d/meshsmoother.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/meshsmoother.h
    branches/asset-browser/extern/eltopo/eltopo3d/trianglequality.cpp
    branches/asset-browser/extern/eltopo/eltopo3d/trianglequality.h
    branches/asset-browser/extern/libmv/libmv/image/correlation.h
    branches/asset-browser/intern/cycles/kernel/svm/svm_ramp.h
    branches/asset-browser/intern/utfconv/
    branches/asset-browser/intern/utfconv/CMakeLists.txt
    branches/asset-browser/intern/utfconv/SConscript
    branches/asset-browser/intern/utfconv/utf_winfunc.c
    branches/asset-browser/intern/utfconv/utf_winfunc.h
    branches/asset-browser/intern/utfconv/utfconv.c
    branches/asset-browser/intern/utfconv/utfconv.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_error.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_inline.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_iterators_inline.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_mesh_validate.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_mesh_validate.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_operator_api_inline.h
    branches/asset-browser/source/blender/editors/mesh/editmesh_knife.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_loopcut.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_select.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_tools.c
    branches/asset-browser/source/blender/editors/mesh/editmesh_utils.c

Removed Paths:
-------------
    branches/asset-browser/extern/libmv/libmv/tracking/sad.cc
    branches/asset-browser/extern/libmv/libmv/tracking/sad.h
    branches/asset-browser/intern/utfconv/CMakeLists.txt
    branches/asset-browser/intern/utfconv/SConscript
    branches/asset-browser/intern/utfconv/utf_winfunc.c
    branches/asset-browser/intern/utfconv/utf_winfunc.h
    branches/asset-browser/intern/utfconv/utfconv.c
    branches/asset-browser/intern/utfconv/utfconv.h
    branches/asset-browser/source/blender/bmesh/bmesh_error.h
    branches/asset-browser/source/blender/bmesh/bmesh_operator_api.h
    branches/asset-browser/source/blender/bmesh/intern/bmesh_inline.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_iterators_inline.c
    branches/asset-browser/source/blender/bmesh/intern/bmesh_operator_api_inline.c
    branches/asset-browser/source/blender/editors/mesh/bmesh_select.c
    branches/asset-browser/source/blender/editors/mesh/bmesh_selecthistory.c
    branches/asset-browser/source/blender/editors/mesh/bmesh_tools.c
    branches/asset-browser/source/blender/editors/mesh/bmesh_utils.c
    branches/asset-browser/source/blender/editors/mesh/knifetool.c
    branches/asset-browser/source/blender/editors/mesh/loopcut.c

Property Changed:
----------------
    branches/asset-browser/
    branches/asset-browser/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_shlex.py
    branches/asset-browser/source/blender/editors/space_outliner/


Property changes on: branches/asset-browser
___________________________________________________________________
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:43077-44985
   + /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:43077-44985,44987-45321

Modified: branches/asset-browser/build_files/scons/tools/Blender.py
===================================================================
--- branches/asset-browser/build_files/scons/tools/Blender.py	2012-04-02 05:34:58 UTC (rev 45326)
+++ branches/asset-browser/build_files/scons/tools/Blender.py	2012-04-02 06:03:36 UTC (rev 45327)
@@ -332,6 +332,9 @@
         incs.append('#/extern/libmv')
         defs.append('WITH_LIBMV')
 
+    if env['WITH_BF_FFMPEG']:
+        defs.append('WITH_FFMPEG')
+
     if env['WITH_BF_PYTHON']:
         incs.append('#/source/blender/python')
         defs.append('WITH_PYTHON')
@@ -340,6 +343,7 @@
 
     if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
         incs.append(env['BF_PTHREADS_INC'])
+        incs.append('#/intern/utfconv')
 
     env.Append(CPPDEFINES=defs)
     env.Append(CPPPATH=incs)
@@ -508,13 +512,12 @@
             print str(func) + ' failed on ' + str(path)
     print "Trying to remove existing py bundle."
     shutil.rmtree(py_target, False, printexception)
-    exclude_re=[re.compile('.*/test/.*'),
-                re.compile('^config/.*'),
-                re.compile('^config-*/.*'),
-                re.compile('^distutils/.*'),
-                re.compile('^idlelib/.*'),
-                re.compile('^lib2to3/.*'),
-                re.compile('^tkinter/.*'),
+    exclude_re=[re.compile('.*/test'),
+                re.compile('^test'),
+                re.compile('^distutils'),
+                re.compile('^idlelib'),
+                re.compile('^lib2to3'),
+                re.compile('^tkinter'),
                 re.compile('^_tkinter_d.pyd'),
                 re.compile('^turtledemo'),
                 re.compile('^turtle.py'),

Modified: branches/asset-browser/doc/python_api/rst/bge.types.rst
===================================================================
--- branches/asset-browser/doc/python_api/rst/bge.types.rst	2012-04-02 05:34:58 UTC (rev 45326)
+++ branches/asset-browser/doc/python_api/rst/bge.types.rst	2012-04-02 06:03:36 UTC (rev 45327)
@@ -1807,7 +1807,7 @@
 
       for mesh in object.meshes:
          for m_index in range(len(mesh.materials)):
-            for v_index in range(mesh.getVertexArrayLength(mat)):
+            for v_index in range(mesh.getVertexArrayLength(m_index)):
                vertex = mesh.getVertex(m_index, v_index)
                # Do something with vertex here...
                # ... eg: colour the vertex red.

Modified: branches/asset-browser/doc/python_api/rst/include__bmesh.rst
===================================================================
--- branches/asset-browser/doc/python_api/rst/include__bmesh.rst	2012-04-02 05:34:58 UTC (rev 45326)
+++ branches/asset-browser/doc/python_api/rst/include__bmesh.rst	2012-04-02 06:03:36 UTC (rev 45327)
@@ -30,12 +30,21 @@
    *Campbell Barton, 13, March 2012*
 
 
-.. todo::
+.. warning::
 
+   TODO Items Are
+
    * add access to BMesh **walkers**
    * add a way to re-tessellate an editmode bmesh.
+   * add deform vert custom-data access.
 
 
+Example Script
+--------------
+
+.. literalinclude:: ../../../release/scripts/templates/bmesh_simple.py
+
+
 Stand-Alone Module
 ^^^^^^^^^^^^^^^^^^
 
@@ -66,16 +75,74 @@
 further access.
 
 
+EditMode Tessellation
+^^^^^^^^^^^^^^^^^^^^^
+
+When writing scripts that operate on editmode data you will normally want to re-calculate the tessellation after
+running the  script, this needs to be called explicitly.
+
+The BMesh its self does not store the triangulated faces, they are stored in the :class:`bpy.types.Mesh`,
+to refresh tessellation faces call :class:`bpy.types.Mesh.calc_tessface`.
+
+
+CustomData Access
+-----------------
+
+BMesh has a unified way to access mesh attributes such as UV's vertex colors, shape keys, edge crease etc.
+
+This works by having a **layers** property on bmesh data sequences to access the custom data layers which can then be
+used to access the actual data on each vert/edge/face/loop.
+
+Here are some examples ...
+
+.. code-block:: python
+
+   uv_lay = bm.loops.layers.uv.active
+
+   for face in bm.faces:
+       for loop in f.loops:
+           uv = loop[uv_lay]
+           print("Loop UV: %f, %f" % (uv.x, uv.y))
+
+
+.. code-block:: python
+
+   shape_lay = bm.verts.layers.shape["Key.001"]
+
+   for vert in bm.verts:
+		shape = vert[shape_lay]
+        print("Vert Shape: %f, %f, %f" % (shape.x, shape.y, shape.z))
+
+
+.. code-block:: python
+
+   # in this example the active vertex group index is used,
+   # this is stored in the object, not the BMesh
+   group_index = obj.vertex_groups.active_index
+
+   # only ever one deform weight layer
+   dvert_lay = bm.verts.layers.deform.active
+
+   for vert in bm.verts:
+       dvert = vert[dvert_lay]
+		
+       if group_index in dvert:
+           print("Weight %f" % dvert[group_index])
+       else:
+           print("Setting Weight")
+           dvert[group_index] = 0.5
+
+
 Keeping a Correct State
 -----------------------
 
 When modeling in blender there are certain assumptions made about the state of the mesh.
 
 * hidden geometry isn't selected.
-* when an edge is selected, its vertices's are selected too.
-* when a face is selected, its edges and vertices's are selected.
+* when an edge is selected, its vertices are selected too.
+* when a face is selected, its edges and vertices are selected.
 * duplicate edges / faces don't exist.
-* faces have at least 3 vertices's.
+* faces have at least 3 vertices.
 
 To give developers flexibility these conventions are not enforced,
 however tools must leave the mesh in a valid state else other tools may behave incorrectly.
@@ -92,11 +159,5 @@
 flush the selection after performing a series of edits. this validates the selection state.
 
 
-Example Script
---------------
-
-.. literalinclude:: ../../../release/scripts/templates/bmesh_simple.py
-
-
 Module Functions
 ----------------

Modified: branches/asset-browser/doc/python_api/rst/info_best_practice.rst
===================================================================
--- branches/asset-browser/doc/python_api/rst/info_best_practice.rst	2012-04-02 05:34:58 UTC (rev 45326)
+++ branches/asset-browser/doc/python_api/rst/info_best_practice.rst	2012-04-02 06:03:36 UTC (rev 45327)
@@ -268,7 +268,7 @@
 
 However **try** is significantly slower then an **if** since an exception has to be set each time, so avoid using **try** in areas of your code that execute in a loop and runs many times.
 
-There are cases where using **try** is faster than checking weather the condition will raise an error, so it is worth experimenting.
+There are cases where using **try** is faster than checking whether the condition will raise an error, so it is worth experimenting.
 
 
 Value Comparison

Modified: branches/asset-browser/doc/python_api/rst/info_gotcha.rst
===================================================================
--- branches/asset-browser/doc/python_api/rst/info_gotcha.rst	2012-04-02 05:34:58 UTC (rev 45326)
+++ branches/asset-browser/doc/python_api/rst/info_gotcha.rst	2012-04-02 06:03:36 UTC (rev 45327)
@@ -132,6 +132,91 @@
 For the time being this limitation just has to be worked around but we're aware its frustrating needs to be addressed.
 
 
+NGons and Tessellation Faces
+============================
+
+Since 2.63 NGons are supported, this adds some complexity since in some cases you need to access triangles still (some exporters for example).
+
+There are now 3 ways to access faces:
+
+* :class:`bpy.types.MeshPolygon` - this is the data stricture which now stores faces in object mode (access as ``mesh.polygons`` rather then ``mesh.faces``).
+* :class:`bpy.types.MeshTessFace` - the result of triangulating (tessellated) polygons, the main method of face access in 2.62 or older (access as ``mesh.tessfaces``).
+* :class:`bmesh.types.BMFace` - the polygons as used in editmode.
+
+For the purpose of the following documentation, these will be referred to as polygons, tessfaces and bmesh-faces respectively.
+
+5+ sided faces will be referred to as ``ngons``.
+
+Support Overview
+----------------
+
++--------------+------------------------------+--------------------------------+--------------------------------+
+|Usage         |:class:`bpy.types.MeshPolygon`|:class:`bpy.types.MeshTessFace` |:class:`bmesh.types.BMFace`     |
++==============+==============================+================================+================================+
+|Import/Create |Bad (inflexible)              |Fine (supported as upgrade path)|Best                            |
++--------------+------------------------------+--------------------------------+--------------------------------+
+|Manipulate    |Bad (inflexible)              |Bad (loses ngons)               |Best                            |
++--------------+------------------------------+--------------------------------+--------------------------------+
+|Export/Output |Good (ngons)                  |Good (When ngons can't be used) |Good (ngons, memory overhead)   |
++--------------+------------------------------+--------------------------------+--------------------------------+
+
+
+.. note::
+
+   Using the :mod:`bmesh` api is completely separate api from :mod:`bpy`, typically you would would use one or the other based on the level of editing needed, not simply for a different way to access faces.
+
+
+Creating
+--------
+
+All 3 datatypes can be used for face creation.
+

@@ Diff output truncated at 10240 characters. @@