[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45316] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 45308.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Sun Apr 1 00:09:58 CEST 2012


Revision: 45316
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45316
Author:   kjym3
Date:     2012-03-31 22:09:43 +0000 (Sat, 31 Mar 2012)
Log Message:
-----------
Merged changes in the trunk up to revision 45308.

Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c

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

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
    branches/soc-2008-mxcurioni/doc/python_api/rst/include__bmesh.rst
    branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
    branches/soc-2008-mxcurioni/extern/eltopo/common/array1.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/array2.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/array3.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/array3_utils.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/bfstream.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/bfstream.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/blas_wrapper.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/ccd_wrapper.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/ccd_wrapper.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/collisionqueries.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/collisionqueries.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/cubic_ccd_wrapper.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/fileio.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/fileio.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/gluvi.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/gluvi.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/grid3.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/hashtable.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/lapack_wrapper.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset3.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/makelevelset3.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/mat.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/matlapack.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/dense_matrix.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/dense_matrix.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/krylov_solvers.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/krylov_solvers.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/linear_operator.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/sparse_matrix.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/newsparse/sparse_matrix.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/predicates.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/predicates.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/expansion.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/expansion.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/intersection.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/neg.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/neg.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/orientation.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/sos_intersection.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/sos_orientation.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/tunicate/tunicate.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/util.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/vec.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/vector_math.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/wallclocktime.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo-capi.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo-capi.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile.example_defs
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/Makefile.inc
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/accelerationgrid.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/accelerationgrid.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphase.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphasegrid.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/broadphasegrid.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/dynamicsurface.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/eltopo.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/eltopo.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/nondestructivetrimesh.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/nondestructivetrimesh.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/options.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/subdivisionscheme.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/subdivisionscheme.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/surftrack.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/surftrack.h
    branches/soc-2008-mxcurioni/extern/libmv/CMakeLists.txt
    branches/soc-2008-mxcurioni/extern/libmv/libmv/image/sample.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/brute_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/brute_region_tracker.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/esm_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv-capi.cpp
    branches/soc-2008-mxcurioni/extern/libmv/libmv-capi.h
    branches/soc-2008-mxcurioni/intern/cycles/blender/addon/properties.py
    branches/soc-2008-mxcurioni/intern/cycles/blender/addon/ui.py
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_session.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_shader.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_sync.cpp
    branches/soc-2008-mxcurioni/intern/cycles/blender/blender_util.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_accumulate.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_emission.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_passes.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_path.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/kernel_types.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2008-mxcurioni/intern/cycles/render/buffers.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/buffers.h
    branches/soc-2008-mxcurioni/intern/cycles/render/film.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/film.h
    branches/soc-2008-mxcurioni/intern/cycles/render/nodes.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/nodes.h
    branches/soc-2008-mxcurioni/intern/cycles/render/svm.cpp
    branches/soc-2008-mxcurioni/intern/cycles/render/svm.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_cuda.h
    branches/soc-2008-mxcurioni/intern/cycles/util/util_math.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_DisplayManager.cpp
    branches/soc-2008-mxcurioni/release/scripts/modules/addon_utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy/utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/console_python.py
    branches/soc-2008-mxcurioni/release/scripts/modules/rna_xml.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/clip.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/object.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/wm.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_mesh_add.py
    branches/soc-2008-mxcurioni/source/blender/avi/intern/avi.c
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_animsys.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_global.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_lattice.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_movieclip.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_tessmesh.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bmfont.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/editderivedmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fluidsim.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/gpencil.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/implicit.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/key.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/nla.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ocean.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/tracking.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_base.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_base_inline.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_color_inline.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom_inline.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/noise.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/path_util.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readblenentry.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_marking.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_mesh_conv.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operator_api.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_operators.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_polygon.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_queries.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_walkers.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_walkers.h
    branches/soc-2008-mxcurioni/source/blender/bmesh/intern/bmesh_walkers_impl.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_bevel.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_connect.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_create.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_dissolve.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_dupe.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_edgesplit.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_extrude.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_inset.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_mirror.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_primitive.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_subdivide.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_triangulate.c
    branches/soc-2008-mxcurioni/source/blender/bmesh/operators/bmo_utils.c
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/AnimationImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ArmatureImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/EffectExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/ImageExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/MeshImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_ipo_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/drivers.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/fmodifier_ui.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_general.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature_retarget.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/reeb.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/startup.blend.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/BIF_glutil.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_anim.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_style.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_bvh.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loopcut.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_navmesh.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_hook.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_object.c
    branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_preview.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_view.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/glutil.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_hide.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_graph_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_graph_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_toolbar.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/clip_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/space_clip.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_console/space_console.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_report.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_stats.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/space_info.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_info/textview.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_channels.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_tools.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_scopes.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/space_text.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_header.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_python.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_time/time_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawanimviz.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_orientations.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/crazyspace.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/ed_util.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/editmode_undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/numinput.c
    branches/soc-2008-mxcurioni/source/blender/editors/util/undo.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/itasc_plugin.cpp
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/cineon_dpx.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/moviecache.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/radiance_hdr.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/tiff.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/util.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_movieclip_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/dna_genfile.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_animation.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_boid.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_image.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_key.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh_utils.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_screen.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_bevel.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_lattice.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/node_composite_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
    branches/soc-2008-mxcurioni/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/soc-2008-mxcurioni/source/blender/nodes/intern/node_socket.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/node_shader_util.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/soc-2008-mxcurioni/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types_customdata.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types_meshdata.c
    branches/soc-2008-mxcurioni/source/blender/python/bmesh/bmesh_py_types_meshdata.h
    branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/bgl.h
    branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/idprop_py_api.c
    branches/soc-2008-mxcurioni/source/blender/python/generic/py_capi_utils.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app_ffmpeg.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app_handlers.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_library.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_anim.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna_array.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_traceback.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_util.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/gpu.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils.h
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Color.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Euler.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2008-mxcurioni/source/blender/python/mathutils/mathutils_noise.c
    branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_empty.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_octree.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/reorganize.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/svbvh.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/vbvh.h
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_texture.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/sunsky.c
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/volume_precache.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_apple.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_cursors.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_gesture.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_jobs.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/creator/creator.c
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_DeformableGameObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/Expression.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/InputParser.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/bmfont.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/xembed/UnixShell.c
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Shader.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Texture.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Camera.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Dome.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_NavMeshObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyMath.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInitTypes.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SG_NodeRelationships.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_FramingManager.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_Controller.cpp
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_IObject.cpp
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_Node.cpp
    branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/SG_Spatial.cpp

Added Paths:
-----------
    branches/soc-2008-mxcurioni/extern/eltopo/common/array2_utils.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/ccd_defs.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/commonoptions.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/lexer.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/lexer.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/marching_tiles_hires.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/marching_tiles_hires.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/newparser.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/newparser.h
    branches/soc-2008-mxcurioni/extern/eltopo/common/runstats.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/common/runstats.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/collisionpipeline.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/collisionpipeline.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/cpp-file-template.txt
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/edgecollapser.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/edgecollapser.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/edgeflipper.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/edgeflipper.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/edgesplitter.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/edgesplitter.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/h-file-template.txt
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/impactzonesolver.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/impactzonesolver.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/meshmerger.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/meshmerger.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/meshpincher.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/meshpincher.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/meshrenderer.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/meshrenderer.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/meshsmoother.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/meshsmoother.h
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/trianglequality.cpp
    branches/soc-2008-mxcurioni/extern/eltopo/eltopo3d/trianglequality.h
    branches/soc-2008-mxcurioni/extern/libmv/libmv/image/correlation.h
    branches/soc-2008-mxcurioni/intern/cycles/kernel/svm/svm_ramp.h

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/sad.cc
    branches/soc-2008-mxcurioni/extern/libmv/libmv/tracking/sad.h

Property Changed:
----------------
    branches/soc-2008-mxcurioni/
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2008-mxcurioni/scons/scons-local-1.2.0.d20090223/SCons/compat/_scons_shlex.py
    branches/soc-2008-mxcurioni/source/blender/editors/render/render_update.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/


Property changes on: branches/soc-2008-mxcurioni
___________________________________________________________________
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:34011-39896,39898-40096,40098-44221,44223-44419,44421-45133
   + /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:34011-39896,39898-40096,40098-44221,44223-44419,44421-45308

Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2012-03-31 21:13:29 UTC (rev 45315)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py	2012-03-31 22:09:43 UTC (rev 45316)
@@ -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')
@@ -509,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/soc-2008-mxcurioni/doc/python_api/rst/include__bmesh.rst
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/rst/include__bmesh.rst	2012-03-31 21:13:29 UTC (rev 45315)
+++ branches/soc-2008-mxcurioni/doc/python_api/rst/include__bmesh.rst	2012-03-31 22:09:43 UTC (rev 45316)
@@ -75,6 +75,16 @@
 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
 -----------------
 
@@ -104,6 +114,25 @@
         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
 -----------------------
 

Modified: branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py	2012-03-31 21:13:29 UTC (rev 45315)
+++ branches/soc-2008-mxcurioni/doc/python_api/sphinx_doc_gen.py	2012-03-31 22:09:43 UTC (rev 45316)
@@ -343,7 +343,8 @@
                     "BMLayerCollection",
                     "BMLayerItem",
                     ("Custom-Data Layer Types", '-'),
-                    "BMLoopUV"
+                    "BMLoopUV",
+                    "BMDeformVert"
                     )
     }
 

Modified: branches/soc-2008-mxcurioni/extern/eltopo/common/array1.h
===================================================================
--- branches/soc-2008-mxcurioni/extern/eltopo/common/array1.h	2012-03-31 21:13:29 UTC (rev 45315)
+++ branches/soc-2008-mxcurioni/extern/eltopo/common/array1.h	2012-03-31 22:09:43 UTC (rev 45316)
@@ -5,11 +5,16 @@
 #include <cassert>
 #include <climits>
 #include <cstdlib>
+#include <cstring>
 #include <iostream>
 #include <stdexcept>
-#include <cstring>
 #include <vector>
 
+#if defined(_WIN32) && !defined(FREE_WINDOWS)
+#include "BaseTsd.h"
+typedef SSIZE_T ssize_t;
+#endif
+
 // In this file:
 //   Array1<T>: a dynamic 1D array for plain-old-data (not objects)
 //   WrapArray1<T>: a 1D array wrapper around an existing array (perhaps objects, perhaps data)
@@ -40,417 +45,417 @@
 template<typename T>
 struct Array1
 {
-   // STL-friendly typedefs
-
-   typedef T* iterator;
-   typedef const T* const_iterator;
-   typedef unsigned long size_type;
-   typedef long difference_type;
-   typedef T& reference;
-   typedef const T& const_reference;
-   typedef T value_type;
-   typedef T* pointer;
-   typedef const T* const_pointer;
-   typedef std::reverse_iterator<iterator> reverse_iterator;
-   typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
-
-   // the actual representation
-
-   unsigned long n;
-   unsigned long max_n;
-   T* data;
-
-   // STL vector's interface, with additions, but only valid when used with plain-old-data
-
-   Array1(void)
-      : n(0), max_n(0), data(0)
-   {}
-
-   // note: default initial values are zero
-   Array1(unsigned long n_)
-      : n(0), max_n(0), data(0)
-   {
-      if(n_>ULONG_MAX/sizeof(T)) throw std::bad_alloc();
-      data=(T*)std::calloc(n_, sizeof(T));
-      if(!data) throw std::bad_alloc();
-      n=n_;
-      max_n=n_;
-   }
-
-   Array1(unsigned long n_, const T& value)
-      : n(0), max_n(0), data(0)
-   {
-      if(n_>ULONG_MAX/sizeof(T)) throw std::bad_alloc();
-      data=(T*)std::calloc(n_, sizeof(T));
-      if(!data) throw std::bad_alloc();
-      n=n_;
-      max_n=n_;
-      for(unsigned long i=0; i<n; ++i) data[i]=value;
-   }
-
-   Array1(unsigned long n_, const T& value, unsigned long max_n_)
-      : n(0), max_n(0), data(0)
-   {
-      assert(n_<=max_n_);
-      if(max_n_>ULONG_MAX/sizeof(T)) throw std::bad_alloc();
-      data=(T*)std::calloc(max_n_, sizeof(T));
-      if(!data) throw std::bad_alloc();
-      n=n_;
-      max_n=max_n_;
-      for(unsigned long i=0; i<n; ++i) data[i]=value;
-   }
-
-   Array1(unsigned long n_, const T* data_)
-      : n(0), max_n(0), data(0)
-   {
-      if(n_>ULONG_MAX/sizeof(T)) throw std::bad_alloc();
-      data=(T*)std::calloc(n_, sizeof(T));
-      if(!data) throw std::bad_alloc();
-      n=n_;
-      max_n=n_;
-      assert(data_);
-      std::memcpy(data, data_, n*sizeof(T));
-   }
-
-   Array1(unsigned long n_, const T* data_, unsigned long max_n_)
-      : n(0), max_n(0), data(0)
-   {
-      assert(n_<=max_n_);
-      if(max_n_>ULONG_MAX/sizeof(T)) throw std::bad_alloc();
-      data=(T*)std::calloc(max_n_, sizeof(T));
-      if(!data) throw std::bad_alloc();
-      max_n=max_n_;
-      n=n_;
-      assert(data_);
-      std::memcpy(data, data_, n*sizeof(T));
-   }
-
-   Array1(const Array1<T> &x)
-      : n(0), max_n(0), data(0)
-   {
-      data=(T*)std::malloc(x.n*sizeof(T));
-      if(!data) throw std::bad_alloc();
-      n=x.n;
-      max_n=x.n;
-      std::memcpy(data, x.data, n*sizeof(T));
-   }
-
-   ~Array1(void)
-   {
-      std::free(data);
+    // STL-friendly typedefs
+    
+    typedef T* iterator;
+    typedef const T* const_iterator;
+    typedef unsigned long size_type;
+    typedef long difference_type;
+    typedef T& reference;
+    typedef const T& const_reference;
+    typedef T value_type;
+    typedef T* pointer;
+    typedef const T* const_pointer;
+    typedef std::reverse_iterator<iterator> reverse_iterator;
+    typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+    
+    // the actual representation
+    
+    unsigned long n;
+    unsigned long max_n;
+    T* data;
+    
+    // STL vector's interface, with additions, but only valid when used with plain-old-data
+    
+    Array1(void)
+    : n(0), max_n(0), data(0)
+    {}
+    
+    // note: default initial values are zero
+    Array1(unsigned long n_)
+    : n(0), max_n(0), data(0)
+    {
+        if(n_>ULONG_MAX/sizeof(T)) throw std::bad_alloc();
+        data=(T*)std::calloc(n_, sizeof(T));
+        if(!data) throw std::bad_alloc();
+        n=n_;
+        max_n=n_;
+    }
+    
+    Array1(unsigned long n_, const T& value)
+    : n(0), max_n(0), data(0)
+    {
+        if(n_>ULONG_MAX/sizeof(T)) throw std::bad_alloc();
+        data=(T*)std::calloc(n_, sizeof(T));
+        if(!data) throw std::bad_alloc();
+        n=n_;
+        max_n=n_;
+        for(unsigned long i=0; i<n; ++i) data[i]=value;
+    }
+    
+    Array1(unsigned long n_, const T& value, unsigned long max_n_)
+    : n(0), max_n(0), data(0)
+    {
+        assert(n_<=max_n_);
+        if(max_n_>ULONG_MAX/sizeof(T)) throw std::bad_alloc();
+        data=(T*)std::calloc(max_n_, sizeof(T));
+        if(!data) throw std::bad_alloc();
+        n=n_;
+        max_n=max_n_;
+        for(unsigned long i=0; i<n; ++i) data[i]=value;
+    }
+    
+    Array1(unsigned long n_, const T* data_)
+    : n(0), max_n(0), data(0)
+    {
+        if(n_>ULONG_MAX/sizeof(T)) throw std::bad_alloc();
+        data=(T*)std::calloc(n_, sizeof(T));
+        if(!data) throw std::bad_alloc();
+        n=n_;
+        max_n=n_;
+        assert(data_);
+        std::memcpy(data, data_, n*sizeof(T));
+    }
+    
+    Array1(unsigned long n_, const T* data_, unsigned long max_n_)
+    : n(0), max_n(0), data(0)
+    {

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list