[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36552] branches/bmesh/blender: =bmesh= merge from trunk at r36529

Joseph Eagar joeedh at gmail.com
Mon May 9 01:43:20 CEST 2011


Revision: 36552
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36552
Author:   joeedh
Date:     2011-05-08 23:43:18 +0000 (Sun, 08 May 2011)
Log Message:
-----------
=bmesh= merge from trunk at r36529

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

Modified Paths:
--------------
    branches/bmesh/blender/CMakeLists.txt
    branches/bmesh/blender/SConstruct
    branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
    branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
    branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py
    branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py
    branches/bmesh/blender/build_files/buildbot/slave_compile.py
    branches/bmesh/blender/build_files/cmake/packaging.cmake
    branches/bmesh/blender/build_files/package_spec/debian/menu
    branches/bmesh/blender/build_files/scons/tools/btools.py
    branches/bmesh/blender/doc/doxygen/doxygen.source
    branches/bmesh/blender/doc/python_api/examples/bpy.types.Operator.1.py
    branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
    branches/bmesh/blender/extern/CMakeLists.txt
    branches/bmesh/blender/extern/SConscript
    branches/bmesh/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/bmesh/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
    branches/bmesh/blender/intern/container/CMakeLists.txt
    branches/bmesh/blender/intern/container/CTR_Map.h
    branches/bmesh/blender/intern/container/SConscript
    branches/bmesh/blender/intern/ghost/GHOST_C-api.h
    branches/bmesh/blender/intern/ghost/GHOST_ISystem.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_C-api.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_Debug.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.h
    branches/bmesh/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/bmesh/blender/intern/ghost/intern/GHOST_WindowWin32.h
    branches/bmesh/blender/intern/ghost/test/gears/GHOST_C-Test.c
    branches/bmesh/blender/intern/guardedalloc/MEM_sys_types.h
    branches/bmesh/blender/intern/guardedalloc/intern/mallocn.c
    branches/bmesh/blender/intern/guardedalloc/intern/mmap_win.c
    branches/bmesh/blender/intern/guardedalloc/test/simpletest/memtest.c
    branches/bmesh/blender/intern/opennl/superlu/superlu_sys_types.h
    branches/bmesh/blender/release/datafiles/brushicons/add.png
    branches/bmesh/blender/release/datafiles/brushicons/blob.png
    branches/bmesh/blender/release/datafiles/brushicons/blur.png
    branches/bmesh/blender/release/datafiles/brushicons/clay.png
    branches/bmesh/blender/release/datafiles/brushicons/clone.png
    branches/bmesh/blender/release/datafiles/brushicons/crease.png
    branches/bmesh/blender/release/datafiles/brushicons/darken.png
    branches/bmesh/blender/release/datafiles/brushicons/draw.png
    branches/bmesh/blender/release/datafiles/brushicons/fill.png
    branches/bmesh/blender/release/datafiles/brushicons/flatten.png
    branches/bmesh/blender/release/datafiles/brushicons/grab.png
    branches/bmesh/blender/release/datafiles/brushicons/inflate.png
    branches/bmesh/blender/release/datafiles/brushicons/layer.png
    branches/bmesh/blender/release/datafiles/brushicons/lighten.png
    branches/bmesh/blender/release/datafiles/brushicons/mix.png
    branches/bmesh/blender/release/datafiles/brushicons/multiply.png
    branches/bmesh/blender/release/datafiles/brushicons/nudge.png
    branches/bmesh/blender/release/datafiles/brushicons/pinch.png
    branches/bmesh/blender/release/datafiles/brushicons/scrape.png
    branches/bmesh/blender/release/datafiles/brushicons/smear.png
    branches/bmesh/blender/release/datafiles/brushicons/smooth.png
    branches/bmesh/blender/release/datafiles/brushicons/snake_hook.png
    branches/bmesh/blender/release/datafiles/brushicons/soften.png
    branches/bmesh/blender/release/datafiles/brushicons/subtract.png
    branches/bmesh/blender/release/datafiles/brushicons/texdraw.png
    branches/bmesh/blender/release/datafiles/brushicons/thumb.png
    branches/bmesh/blender/release/datafiles/brushicons/twist.png
    branches/bmesh/blender/release/datafiles/brushicons/vertexdraw.png
    branches/bmesh/blender/release/plugins/sequence/blur.c
    branches/bmesh/blender/release/plugins/sequence/color-correction-hsv.c
    branches/bmesh/blender/release/plugins/sequence/color-correction-yuv.c
    branches/bmesh/blender/release/plugins/sequence/dnr.c
    branches/bmesh/blender/release/plugins/sequence/gamma.c
    branches/bmesh/blender/release/plugins/sequence/scatter.c
    branches/bmesh/blender/release/release_todo.txt
    branches/bmesh/blender/release/scripts/modules/bpy/path.py
    branches/bmesh/blender/release/scripts/modules/bpy/utils.py
    branches/bmesh/blender/release/scripts/modules/io_utils.py
    branches/bmesh/blender/release/scripts/presets/interaction/blender.py
    branches/bmesh/blender/release/scripts/presets/interaction/maya.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/animsys_update.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/mesh.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/object.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/object_quick_effects.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/presets.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_cloth.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_image.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/bmesh/blender/release/scripts/startup/keyingsets_builtins.py
    branches/bmesh/blender/release/scripts/templates/operator_export.py
    branches/bmesh/blender/release/windows/contrib/vfapi/vfapi-plugin.c
    branches/bmesh/blender/source/CMakeLists.txt
    branches/bmesh/blender/source/SConscript
    branches/bmesh/blender/source/blender/avi/intern/avi.c
    branches/bmesh/blender/source/blender/avi/intern/codecs.c
    branches/bmesh/blender/source/blender/avi/intern/options.c
    branches/bmesh/blender/source/blender/blenfont/BLF_api.h
    branches/bmesh/blender/source/blender/blenfont/intern/blf.c
    branches/bmesh/blender/source/blender/blenfont/intern/blf_font.c
    branches/bmesh/blender/source/blender/blenfont/intern/blf_internal_types.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_cdderivedmesh.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_cloth.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_collision.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_font.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_idcode.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_image.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_material.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_mesh.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_object.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_sequencer.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_shrinkwrap.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_sketch.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_text.h
    branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
    branches/bmesh/blender/source/blender/blenkernel/SConscript
    branches/bmesh/blender/source/blender/blenkernel/intern/DerivedMesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/action.c
    branches/bmesh/blender/source/blender/blenkernel/intern/anim_sys.c
    branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
    branches/bmesh/blender/source/blender/blenkernel/intern/blender.c
    branches/bmesh/blender/source/blender/blenkernel/intern/boids.c
    branches/bmesh/blender/source/blender/blenkernel/intern/brush.c
    branches/bmesh/blender/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c
    branches/bmesh/blender/source/blender/blenkernel/intern/collision.c
    branches/bmesh/blender/source/blender/blenkernel/intern/colortools.c
    branches/bmesh/blender/source/blender/blenkernel/intern/constraint.c
    branches/bmesh/blender/source/blender/blenkernel/intern/context.c
    branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
    branches/bmesh/blender/source/blender/blenkernel/intern/deform.c
    branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c
    branches/bmesh/blender/source/blender/blenkernel/intern/displist.c
    branches/bmesh/blender/source/blender/blenkernel/intern/font.c
    branches/bmesh/blender/source/blender/blenkernel/intern/idcode.c
    branches/bmesh/blender/source/blender/blenkernel/intern/idprop.c
    branches/bmesh/blender/source/blender/blenkernel/intern/image.c
    branches/bmesh/blender/source/blender/blenkernel/intern/image_gen.c
    branches/bmesh/blender/source/blender/blenkernel/intern/implicit.c
    branches/bmesh/blender/source/blender/blenkernel/intern/ipo.c
    branches/bmesh/blender/source/blender/blenkernel/intern/lattice.c
    branches/bmesh/blender/source/blender/blenkernel/intern/library.c
    branches/bmesh/blender/source/blender/blenkernel/intern/material.c
    branches/bmesh/blender/source/blender/blenkernel/intern/mball.c
    branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/mesh_validate.c
    branches/bmesh/blender/source/blender/blenkernel/intern/node.c
    branches/bmesh/blender/source/blender/blenkernel/intern/object.c
    branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
    branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
    branches/bmesh/blender/source/blender/blenkernel/intern/pointcache.c
    branches/bmesh/blender/source/blender/blenkernel/intern/report.c
    branches/bmesh/blender/source/blender/blenkernel/intern/sca.c
    branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
    branches/bmesh/blender/source/blender/blenkernel/intern/seqcache.c
    branches/bmesh/blender/source/blender/blenkernel/intern/seqeffects.c
    branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
    branches/bmesh/blender/source/blender/blenkernel/intern/sketch.c
    branches/bmesh/blender/source/blender/blenkernel/intern/smoke.c
    branches/bmesh/blender/source/blender/blenkernel/intern/softbody.c
    branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/bmesh/blender/source/blender/blenkernel/intern/text.c
    branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
    branches/bmesh/blender/source/blender/blenkernel/intern/unit.c
    branches/bmesh/blender/source/blender/blenkernel/intern/world.c
    branches/bmesh/blender/source/blender/blenkernel/intern/writeavi.c
    branches/bmesh/blender/source/blender/blenlib/BLI_listbase.h
    branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h
    branches/bmesh/blender/source/blender/blenlib/BLI_path_util.h
    branches/bmesh/blender/source/blender/blenlib/BLI_winstuff.h
    branches/bmesh/blender/source/blender/blenlib/CMakeLists.txt
    branches/bmesh/blender/source/blender/blenlib/intern/BLI_ghash.c
    branches/bmesh/blender/source/blender/blenlib/intern/boxpack2d.c
    branches/bmesh/blender/source/blender/blenlib/intern/dynlib.c
    branches/bmesh/blender/source/blender/blenlib/intern/fileops.c
    branches/bmesh/blender/source/blender/blenlib/intern/listbase.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_color.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_geom.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_geom_inline.c
    branches/bmesh/blender/source/blender/blenlib/intern/math_vector_inline.c
    branches/bmesh/blender/source/blender/blenlib/intern/noise.c
    branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
    branches/bmesh/blender/source/blender/blenlib/intern/pbvh.c
    branches/bmesh/blender/source/blender/blenlib/intern/string.c
    branches/bmesh/blender/source/blender/blenlib/intern/winstuff.c
    branches/bmesh/blender/source/blender/blenloader/BLO_readfile.h
    branches/bmesh/blender/source/blender/blenloader/intern/readblenentry.c
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
    branches/bmesh/blender/source/blender/bmesh/bmesh_iterators.h
    branches/bmesh/blender/source/blender/collada/collada.cpp
    branches/bmesh/blender/source/blender/editors/animation/anim_channels_defines.c
    branches/bmesh/blender/source/blender/editors/animation/anim_channels_edit.c
    branches/bmesh/blender/source/blender/editors/animation/anim_filter.c
    branches/bmesh/blender/source/blender/editors/animation/keyframes_edit.c
    branches/bmesh/blender/source/blender/editors/animation/keyframes_general.c
    branches/bmesh/blender/source/blender/editors/animation/keyframing.c
    branches/bmesh/blender/source/blender/editors/armature/armature_intern.h
    branches/bmesh/blender/source/blender/editors/armature/editarmature.c
    branches/bmesh/blender/source/blender/editors/armature/editarmature_retarget.c
    branches/bmesh/blender/source/blender/editors/armature/editarmature_sketch.c
    branches/bmesh/blender/source/blender/editors/armature/meshlaplacian.c
    branches/bmesh/blender/source/blender/editors/armature/poseSlide.c
    branches/bmesh/blender/source/blender/editors/armature/poseobject.c
    branches/bmesh/blender/source/blender/editors/armature/reeb.c
    branches/bmesh/blender/source/blender/editors/curve/editcurve.c
    branches/bmesh/blender/source/blender/editors/curve/editfont.c
    branches/bmesh/blender/source/blender/editors/datafiles/startup.blend.c
    branches/bmesh/blender/source/blender/editors/gpencil/drawgpencil.c
    branches/bmesh/blender/source/blender/editors/gpencil/gpencil_buttons.c
    branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c
    branches/bmesh/blender/source/blender/editors/include/ED_anim_api.h
    branches/bmesh/blender/source/blender/editors/include/ED_armature.h
    branches/bmesh/blender/source/blender/editors/include/ED_mball.h
    branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
    branches/bmesh/blender/source/blender/editors/include/ED_object.h
    branches/bmesh/blender/source/blender/editors/include/ED_particle.h
    branches/bmesh/blender/source/blender/editors/include/ED_uvedit.h
    branches/bmesh/blender/source/blender/editors/include/ED_view3d.h
    branches/bmesh/blender/source/blender/editors/include/UI_interface.h
    branches/bmesh/blender/source/blender/editors/interface/interface.c
    branches/bmesh/blender/source/blender/editors/interface/interface_draw.c
    branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
    branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
    branches/bmesh/blender/source/blender/editors/interface/interface_panel.c
    branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
    branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
    branches/bmesh/blender/source/blender/editors/interface/interface_utils.c
    branches/bmesh/blender/source/blender/editors/interface/interface_widgets.c
    branches/bmesh/blender/source/blender/editors/interface/view2d_ops.c
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_select.c
    branches/bmesh/blender/source/blender/editors/mesh/bmesh_tools.c
    branches/bmesh/blender/source/blender/editors/mesh/editface.c
    branches/bmesh/blender/source/blender/editors/mesh/mesh_data.c
    branches/bmesh/blender/source/blender/editors/mesh/mesh_ops.c
    branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
    branches/bmesh/blender/source/blender/editors/metaball/mball_edit.c
    branches/bmesh/blender/source/blender/editors/object/object_add.c
    branches/bmesh/blender/source/blender/editors/object/object_bake.c
    branches/bmesh/blender/source/blender/editors/object/object_constraint.c
    branches/bmesh/blender/source/blender/editors/object/object_group.c
    branches/bmesh/blender/source/blender/editors/object/object_intern.h
    branches/bmesh/blender/source/blender/editors/object/object_lattice.c
    branches/bmesh/blender/source/blender/editors/object/object_ops.c
    branches/bmesh/blender/source/blender/editors/object/object_relations.c
    branches/bmesh/blender/source/blender/editors/object/object_select.c
    branches/bmesh/blender/source/blender/editors/object/object_transform.c
    branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
    branches/bmesh/blender/source/blender/editors/physics/particle_edit.c
    branches/bmesh/blender/source/blender/editors/render/render_internal.c
    branches/bmesh/blender/source/blender/editors/render/render_opengl.c
    branches/bmesh/blender/source/blender/editors/render/render_preview.c
    branches/bmesh/blender/source/blender/editors/render/render_shading.c
    branches/bmesh/blender/source/blender/editors/screen/area.c
    branches/bmesh/blender/source/blender/editors/screen/screen_edit.c
    branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
    branches/bmesh/blender/source/blender/editors/screen/screendump.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_ops.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/bmesh/blender/source/blender/editors/sound/sound_ops.c
    branches/bmesh/blender/source/blender/editors/space_action/action_edit.c
    branches/bmesh/blender/source/blender/editors/space_action/space_action.c
    branches/bmesh/blender/source/blender/editors/space_console/space_console.c
    branches/bmesh/blender/source/blender/editors/space_file/file_draw.c
    branches/bmesh/blender/source/blender/editors/space_file/file_ops.c
    branches/bmesh/blender/source/blender/editors/space_file/filelist.c
    branches/bmesh/blender/source/blender/editors/space_file/filesel.c
    branches/bmesh/blender/source/blender/editors/space_graph/graph_buttons.c
    branches/bmesh/blender/source/blender/editors/space_graph/graph_select.c
    branches/bmesh/blender/source/blender/editors/space_image/CMakeLists.txt
    branches/bmesh/blender/source/blender/editors/space_image/image_buttons.c
    branches/bmesh/blender/source/blender/editors/space_image/image_draw.c
    branches/bmesh/blender/source/blender/editors/space_image/image_intern.h
    branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
    branches/bmesh/blender/source/blender/editors/space_image/space_image.c
    branches/bmesh/blender/source/blender/editors/space_logic/logic_ops.c
    branches/bmesh/blender/source/blender/editors/space_logic/logic_window.c
    branches/bmesh/blender/source/blender/editors/space_nla/nla_buttons.c
    branches/bmesh/blender/source/blender/editors/space_nla/nla_edit.c
    branches/bmesh/blender/source/blender/editors/space_nla/space_nla.c
    branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
    branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
    branches/bmesh/blender/source/blender/editors/space_node/node_header.c
    branches/bmesh/blender/source/blender/editors/space_node/node_intern.h
    branches/bmesh/blender/source/blender/editors/space_node/node_select.c
    branches/bmesh/blender/source/blender/editors/space_node/node_state.c
    branches/bmesh/blender/source/blender/editors/space_node/space_node.c
    branches/bmesh/blender/source/blender/editors/space_outliner/outliner.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/bmesh/blender/source/blender/editors/space_text/text_ops.c
    branches/bmesh/blender/source/blender/editors/space_time/time_ops.c
    branches/bmesh/blender/source/blender/editors/space_view3d/CMakeLists.txt
    branches/bmesh/blender/source/blender/editors/space_view3d/SConscript
    branches/bmesh/blender/source/blender/editors/space_view3d/drawarmature.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
    branches/bmesh/blender/source/blender/editors/space_view3d/space_view3d.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_fly.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_intern.h
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_ops.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
    branches/bmesh/blender/source/blender/editors/transform/transform.c
    branches/bmesh/blender/source/blender/editors/transform/transform.h
    branches/bmesh/blender/source/blender/editors/transform/transform_constraints.c
    branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
    branches/bmesh/blender/source/blender/editors/transform/transform_generics.c
    branches/bmesh/blender/source/blender/editors/transform/transform_input.c
    branches/bmesh/blender/source/blender/editors/transform/transform_manipulator.c
    branches/bmesh/blender/source/blender/editors/transform/transform_snap.c
    branches/bmesh/blender/source/blender/editors/util/crazyspace.c
    branches/bmesh/blender/source/blender/editors/uvedit/CMakeLists.txt
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_draw.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_ops.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_extensions.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_material.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/bmesh/blender/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/bmesh/blender/source/blender/imbuf/CMakeLists.txt
    branches/bmesh/blender/source/blender/imbuf/IMB_thumbs.h
    branches/bmesh/blender/source/blender/imbuf/intern/anim_movie.c
    branches/bmesh/blender/source/blender/imbuf/intern/jpeg.c
    branches/bmesh/blender/source/blender/imbuf/intern/scaling.c
    branches/bmesh/blender/source/blender/imbuf/intern/thumbs.c
    branches/bmesh/blender/source/blender/imbuf/intern/tiff.c
    branches/bmesh/blender/source/blender/makesdna/DNA_action_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_cloth_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_mesh_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_modifier_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_texture_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_userdef_types.h
    branches/bmesh/blender/source/blender/makesdna/intern/dna_genfile.c
    branches/bmesh/blender/source/blender/makesdna/intern/makesdna.c
    branches/bmesh/blender/source/blender/makesrna/RNA_access.h
    branches/bmesh/blender/source/blender/makesrna/intern/CMakeLists.txt
    branches/bmesh/blender/source/blender/makesrna/intern/rna_ID.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_action.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_actuator.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_animation.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_brush.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_cloth.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_constraint.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_controller.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_curve.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_fcurve.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_gpencil.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_image.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_image_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_internal.h
    branches/bmesh/blender/source/blender/makesrna/intern/rna_lamp.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_modifier.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_nla.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_object_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_object_force.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_particle.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_pose.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_sensor.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_texture.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_ui_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_wm.c
    branches/bmesh/blender/source/blender/modifiers/CMakeLists.txt
    branches/bmesh/blender/source/blender/modifiers/MOD_modifiertypes.h
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_build.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_cast.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_displace.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_explode.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_multires.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_ngoninterp.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_util.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_util.h
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_wave.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorSpill.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_curves.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_diffMatte.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_distanceMatte.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_hueSatVal.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_image.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_invert.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_lensdist.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_levels.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_mapValue.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_math.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_splitViewer.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_valToRgb.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_nodes/CMP_viewer.c
    branches/bmesh/blender/source/blender/nodes/intern/CMP_util.c
    branches/bmesh/blender/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
    branches/bmesh/blender/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
    branches/bmesh/blender/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
    branches/bmesh/blender/source/blender/nodes/intern/SHD_nodes/SHD_material.c
    branches/bmesh/blender/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
    branches/bmesh/blender/source/blender/nodes/intern/TEX_nodes/TEX_curves.c
    branches/bmesh/blender/source/blender/nodes/intern/TEX_nodes/TEX_image.c
    branches/bmesh/blender/source/blender/nodes/intern/TEX_nodes/TEX_math.c
    branches/bmesh/blender/source/blender/nodes/intern/TEX_nodes/TEX_valToRgb.c
    branches/bmesh/blender/source/blender/nodes/intern/TEX_util.c
    branches/bmesh/blender/source/blender/python/BPY_extern.h
    branches/bmesh/blender/source/blender/python/generic/IDProp.c
    branches/bmesh/blender/source/blender/python/generic/bgl.c
    branches/bmesh/blender/source/blender/python/generic/bpy_internal_import.c
    branches/bmesh/blender/source/blender/python/generic/mathutils_geometry.c
    branches/bmesh/blender/source/blender/python/generic/py_capi_utils.c
    branches/bmesh/blender/source/blender/python/generic/py_capi_utils.h
    branches/bmesh/blender/source/blender/python/intern/bpy.c
    branches/bmesh/blender/source/blender/python/intern/bpy_driver.c
    branches/bmesh/blender/source/blender/python/intern/bpy_interface.c
    branches/bmesh/blender/source/blender/python/intern/bpy_library.c
    branches/bmesh/blender/source/blender/python/intern/bpy_operator.c
    branches/bmesh/blender/source/blender/python/intern/bpy_props.c
    branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
    branches/bmesh/blender/source/blender/python/intern/bpy_rna_anim.c
    branches/bmesh/blender/source/blender/python/intern/bpy_traceback.c
    branches/bmesh/blender/source/blender/python/intern/bpy_util.c
    branches/bmesh/blender/source/blender/quicktime/apple/quicktime_import.c
    branches/bmesh/blender/source/blender/readblenfile/CMakeLists.txt
    branches/bmesh/blender/source/blender/readblenfile/SConscript
    branches/bmesh/blender/source/blender/readblenfile/stub/BLO_readblenfileSTUB.c
    branches/bmesh/blender/source/blender/render/CMakeLists.txt
    branches/bmesh/blender/source/blender/render/extern/include/RE_pipeline.h
    branches/bmesh/blender/source/blender/render/intern/include/render_types.h
    branches/bmesh/blender/source/blender/render/intern/raytrace/reorganize.h
    branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
    branches/bmesh/blender/source/blender/render/intern/source/imagetexture.c
    branches/bmesh/blender/source/blender/render/intern/source/initrender.c
    branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
    branches/bmesh/blender/source/blender/render/intern/source/pixelblending.c
    branches/bmesh/blender/source/blender/render/intern/source/pixelshading.c
    branches/bmesh/blender/source/blender/render/intern/source/pointdensity.c
    branches/bmesh/blender/source/blender/render/intern/source/rayshade.c
    branches/bmesh/blender/source/blender/render/intern/source/render_texture.c
    branches/bmesh/blender/source/blender/render/intern/source/rendercore.c
    branches/bmesh/blender/source/blender/render/intern/source/shadbuf.c
    branches/bmesh/blender/source/blender/render/intern/source/shadeinput.c
    branches/bmesh/blender/source/blender/render/intern/source/shadeoutput.c
    branches/bmesh/blender/source/blender/render/intern/source/strand.c
    branches/bmesh/blender/source/blender/render/intern/source/sunsky.c
    branches/bmesh/blender/source/blender/render/intern/source/volume_precache.c
    branches/bmesh/blender/source/blender/render/intern/source/voxeldata.c
    branches/bmesh/blender/source/blender/render/intern/source/zbuf.c
    branches/bmesh/blender/source/blender/windowmanager/CMakeLists.txt
    branches/bmesh/blender/source/blender/windowmanager/SConscript
    branches/bmesh/blender/source/blender/windowmanager/WM_api.h
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_files.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_jobs.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
    branches/bmesh/blender/source/blender/windowmanager/wm_event_system.h
    branches/bmesh/blender/source/blenderplayer/CMakeLists.txt
    branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/bmesh/blender/source/creator/CMakeLists.txt
    branches/bmesh/blender/source/creator/SConscript
    branches/bmesh/blender/source/creator/creator.c
    branches/bmesh/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/bmesh/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/BlenderRoutines/SConscript
    branches/bmesh/blender/source/gameengine/Converter/BL_ActionActuator.h
    branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureActuator.cpp
    branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureActuator.h
    branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureChannel.h
    branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureConstraint.cpp
    branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureConstraint.h
    branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/bmesh/blender/source/gameengine/Converter/BL_ArmatureObject.h
    branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/bmesh/blender/source/gameengine/Converter/BL_BlenderDataConversion.h
    branches/bmesh/blender/source/gameengine/Converter/BL_DeformableGameObject.h
    branches/bmesh/blender/source/gameengine/Converter/BL_MeshDeformer.cpp
    branches/bmesh/blender/source/gameengine/Converter/BL_MeshDeformer.h
    branches/bmesh/blender/source/gameengine/Converter/BL_ModifierDeformer.cpp
    branches/bmesh/blender/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/bmesh/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
    branches/bmesh/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
    branches/bmesh/blender/source/gameengine/Converter/BL_SkinDeformer.h
    branches/bmesh/blender/source/gameengine/Converter/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/bmesh/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/bmesh/blender/source/gameengine/Converter/KX_SoftBodyDeformer.cpp
    branches/bmesh/blender/source/gameengine/Converter/KX_SoftBodyDeformer.h
    branches/bmesh/blender/source/gameengine/Converter/SConscript
    branches/bmesh/blender/source/gameengine/Expressions/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Expressions/SConscript
    branches/bmesh/blender/source/gameengine/GameLogic/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_LogicManager.h
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/bmesh/blender/source/gameengine/GameLogic/SCA_PropertyActuator.h
    branches/bmesh/blender/source/gameengine/GameLogic/SConscript
    branches/bmesh/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/GamePlayer/common/GPC_Engine.cpp
    branches/bmesh/blender/source/gameengine/GamePlayer/common/SConscript
    branches/bmesh/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/bmesh/blender/source/gameengine/GamePlayer/ghost/SConscript
    branches/bmesh/blender/source/gameengine/GamePlayer/xembed/UnixShell.c
    branches/bmesh/blender/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
    branches/bmesh/blender/source/gameengine/GamePlayer/xembed/npunix.c
    branches/bmesh/blender/source/gameengine/Ketsji/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Ketsji/KXNetwork/SConscript
    branches/bmesh/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_CameraActuator.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_GameObject.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_ObjectActuator.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_Scene.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_Scene.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_SceneActuator.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/bmesh/blender/source/gameengine/Ketsji/SConscript
    branches/bmesh/blender/source/gameengine/Network/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Network/LoopBackNetwork/SConscript
    branches/bmesh/blender/source/gameengine/Network/NG_NetworkScene.h
    branches/bmesh/blender/source/gameengine/Network/SConscript
    branches/bmesh/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
    branches/bmesh/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/bmesh/blender/source/gameengine/Physics/Bullet/SConscript
    branches/bmesh/blender/source/gameengine/Rasterizer/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/bmesh/blender/source/gameengine/Rasterizer/RAS_BucketManager.h
    branches/bmesh/blender/source/gameengine/Rasterizer/RAS_Deformer.h
    branches/bmesh/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.h
    branches/bmesh/blender/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/bmesh/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/bmesh/blender/source/gameengine/Rasterizer/SConscript
    branches/bmesh/blender/source/gameengine/VideoTexture/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/VideoTexture/SConscript
    branches/bmesh/blender/source/tests/CMakeLists.txt

Added Paths:
-----------
    branches/bmesh/blender/build_files/package_spec/rpm/
    branches/bmesh/blender/build_files/package_spec/rpm/blender.spec.in
    branches/bmesh/blender/extern/eltopo/
    branches/bmesh/blender/extern/eltopo/CMakeLists.txt
    branches/bmesh/blender/extern/eltopo/SConscript
    branches/bmesh/blender/extern/eltopo/common/
    branches/bmesh/blender/extern/eltopo/common/array1.h
    branches/bmesh/blender/extern/eltopo/common/array2.h
    branches/bmesh/blender/extern/eltopo/common/array3.h
    branches/bmesh/blender/extern/eltopo/common/array3_utils.h
    branches/bmesh/blender/extern/eltopo/common/bfstream.cpp
    branches/bmesh/blender/extern/eltopo/common/bfstream.h
    branches/bmesh/blender/extern/eltopo/common/blas_wrapper.h
    branches/bmesh/blender/extern/eltopo/common/ccd_wrapper.cpp
    branches/bmesh/blender/extern/eltopo/common/ccd_wrapper.h
    branches/bmesh/blender/extern/eltopo/common/clamped_spline.cpp
    branches/bmesh/blender/extern/eltopo/common/clamped_spline.h
    branches/bmesh/blender/extern/eltopo/common/collisionqueries.cpp
    branches/bmesh/blender/extern/eltopo/common/collisionqueries.h
    branches/bmesh/blender/extern/eltopo/common/cubic_ccd_wrapper.cpp
    branches/bmesh/blender/extern/eltopo/common/fe_ccd_wrapper.cpp
    branches/bmesh/blender/extern/eltopo/common/fileio.cpp
    branches/bmesh/blender/extern/eltopo/common/fileio.h
    branches/bmesh/blender/extern/eltopo/common/gluvi.cpp
    branches/bmesh/blender/extern/eltopo/common/gluvi.h
    branches/bmesh/blender/extern/eltopo/common/grid3.h
    branches/bmesh/blender/extern/eltopo/common/hashtable.h
    branches/bmesh/blender/extern/eltopo/common/lapack_wrapper.h
    branches/bmesh/blender/extern/eltopo/common/levelset.cpp
    branches/bmesh/blender/extern/eltopo/common/levelset.h
    branches/bmesh/blender/extern/eltopo/common/makelevelset2.cpp
    branches/bmesh/blender/extern/eltopo/common/makelevelset2.h
    branches/bmesh/blender/extern/eltopo/common/makelevelset3.cpp
    branches/bmesh/blender/extern/eltopo/common/makelevelset3.h
    branches/bmesh/blender/extern/eltopo/common/marching_triangles.cpp
    branches/bmesh/blender/extern/eltopo/common/marching_triangles.h
    branches/bmesh/blender/extern/eltopo/common/mat.h
    branches/bmesh/blender/extern/eltopo/common/matlapack.h
    branches/bmesh/blender/extern/eltopo/common/meshes/
    branches/bmesh/blender/extern/eltopo/common/meshes/Edge.hpp
    branches/bmesh/blender/extern/eltopo/common/meshes/ObjLoader.cpp
    branches/bmesh/blender/extern/eltopo/common/meshes/ObjLoader.hpp
    branches/bmesh/blender/extern/eltopo/common/meshes/TriangleIndex.hpp
    branches/bmesh/blender/extern/eltopo/common/meshes/meshloader.cpp
    branches/bmesh/blender/extern/eltopo/common/meshes/meshloader.h
    branches/bmesh/blender/extern/eltopo/common/newsparse/
    branches/bmesh/blender/extern/eltopo/common/newsparse/dense_matrix.cpp
    branches/bmesh/blender/extern/eltopo/common/newsparse/dense_matrix.h
    branches/bmesh/blender/extern/eltopo/common/newsparse/krylov_solvers.cpp
    branches/bmesh/blender/extern/eltopo/common/newsparse/krylov_solvers.h
    branches/bmesh/blender/extern/eltopo/common/newsparse/linear_operator.h
    branches/bmesh/blender/extern/eltopo/common/newsparse/sparse_matrix.cpp
    branches/bmesh/blender/extern/eltopo/common/newsparse/sparse_matrix.h
    branches/bmesh/blender/extern/eltopo/common/openglutils.cpp
    branches/bmesh/blender/extern/eltopo/common/openglutils.h
    branches/bmesh/blender/extern/eltopo/common/predicates.cpp
    branches/bmesh/blender/extern/eltopo/common/predicates.h
    branches/bmesh/blender/extern/eltopo/common/sos_ccd_wrapper.cpp
    branches/bmesh/blender/extern/eltopo/common/sparse/
    branches/bmesh/blender/extern/eltopo/common/sparse/cgsolver.h
    branches/bmesh/blender/extern/eltopo/common/sparse/crsolver.h
    branches/bmesh/blender/extern/eltopo/common/sparse/incomplete_qr.cpp
    branches/bmesh/blender/extern/eltopo/common/sparse/incomplete_qr.h
    branches/bmesh/blender/extern/eltopo/common/sparse/sparseilu.h
    branches/bmesh/blender/extern/eltopo/common/sparse/sparsematrix.h
    branches/bmesh/blender/extern/eltopo/common/sparse/sparsemilu.h
    branches/bmesh/blender/extern/eltopo/common/tunicate/
    branches/bmesh/blender/extern/eltopo/common/tunicate/expansion.cpp
    branches/bmesh/blender/extern/eltopo/common/tunicate/expansion.h
    branches/bmesh/blender/extern/eltopo/common/tunicate/intersection.cpp
    branches/bmesh/blender/extern/eltopo/common/tunicate/neg.cpp
    branches/bmesh/blender/extern/eltopo/common/tunicate/neg.h
    branches/bmesh/blender/extern/eltopo/common/tunicate/orientation.cpp
    branches/bmesh/blender/extern/eltopo/common/tunicate/sos_intersection.cpp
    branches/bmesh/blender/extern/eltopo/common/tunicate/sos_orientation.cpp
    branches/bmesh/blender/extern/eltopo/common/tunicate/tunicate.h
    branches/bmesh/blender/extern/eltopo/common/util.h
    branches/bmesh/blender/extern/eltopo/common/vec.h
    branches/bmesh/blender/extern/eltopo/common/vector_math.h
    branches/bmesh/blender/extern/eltopo/common/wallclocktime.cpp
    branches/bmesh/blender/extern/eltopo/common/wallclocktime.h
    branches/bmesh/blender/extern/eltopo/eltopo-capi.cpp
    branches/bmesh/blender/extern/eltopo/eltopo-capi.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/
    branches/bmesh/blender/extern/eltopo/eltopo3d/Makefile
    branches/bmesh/blender/extern/eltopo/eltopo3d/Makefile.example_defs
    branches/bmesh/blender/extern/eltopo/eltopo3d/Makefile.inc
    branches/bmesh/blender/extern/eltopo/eltopo3d/Makefile.local_defs
    branches/bmesh/blender/extern/eltopo/eltopo3d/accelerationgrid.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/accelerationgrid.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/broadphase.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/broadphase_blenderbvh.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/broadphase_blenderbvh.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/broadphasegrid.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/broadphasegrid.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/dynamicsurface.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/dynamicsurface.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/eltopo.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/eltopo.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/nondestructivetrimesh.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/nondestructivetrimesh.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/obj/
    branches/bmesh/blender/extern/eltopo/eltopo3d/obj_debug/
    branches/bmesh/blender/extern/eltopo/eltopo3d/options.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/readme.txt
    branches/bmesh/blender/extern/eltopo/eltopo3d/subdivisionscheme.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/subdivisionscheme.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/surftrack.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/surftrack.h
    branches/bmesh/blender/extern/eltopo/readme.txt
    branches/bmesh/blender/release/freedesktop/icons/16x16/apps/
    branches/bmesh/blender/release/freedesktop/icons/16x16/apps/blender.png
    branches/bmesh/blender/release/freedesktop/icons/22x22/apps/
    branches/bmesh/blender/release/freedesktop/icons/22x22/apps/blender.png
    branches/bmesh/blender/release/freedesktop/icons/24x24/
    branches/bmesh/blender/release/freedesktop/icons/24x24/apps/
    branches/bmesh/blender/release/freedesktop/icons/24x24/apps/blender.png
    branches/bmesh/blender/release/freedesktop/icons/256x256/
    branches/bmesh/blender/release/freedesktop/icons/256x256/apps/
    branches/bmesh/blender/release/freedesktop/icons/256x256/apps/blender.png
    branches/bmesh/blender/release/freedesktop/icons/32x32/apps/
    branches/bmesh/blender/release/freedesktop/icons/32x32/apps/blender.png
    branches/bmesh/blender/release/freedesktop/icons/48x48/apps/
    branches/bmesh/blender/release/freedesktop/icons/48x48/apps/blender.png
    branches/bmesh/blender/release/freedesktop/icons/blender_icon_source.svg
    branches/bmesh/blender/release/freedesktop/icons/scalable/apps/
    branches/bmesh/blender/release/freedesktop/icons/scalable/apps/blender.svg
    branches/bmesh/blender/source/blender/blenlib/BLI_dynlib.h
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_warp.c
    branches/bmesh/blender/source/gameengine/BlenderRoutines/BL_System.cpp
    branches/bmesh/blender/source/gameengine/BlenderRoutines/BL_System.h

Removed Paths:
-------------
    branches/bmesh/blender/build_files/package_spec/rpm/blender.spec.in
    branches/bmesh/blender/extern/bullet2/uninitialized_stack_vec.patch
    branches/bmesh/blender/extern/eltopo/CMakeLists.txt
    branches/bmesh/blender/extern/eltopo/SConscript
    branches/bmesh/blender/extern/eltopo/common/
    branches/bmesh/blender/extern/eltopo/common/array1.h
    branches/bmesh/blender/extern/eltopo/common/array2.h
    branches/bmesh/blender/extern/eltopo/common/array3.h
    branches/bmesh/blender/extern/eltopo/common/array3_utils.h
    branches/bmesh/blender/extern/eltopo/common/bfstream.cpp
    branches/bmesh/blender/extern/eltopo/common/bfstream.h
    branches/bmesh/blender/extern/eltopo/common/blas_wrapper.h
    branches/bmesh/blender/extern/eltopo/common/ccd_wrapper.cpp
    branches/bmesh/blender/extern/eltopo/common/ccd_wrapper.h
    branches/bmesh/blender/extern/eltopo/common/clamped_spline.cpp
    branches/bmesh/blender/extern/eltopo/common/clamped_spline.h
    branches/bmesh/blender/extern/eltopo/common/collisionqueries.cpp
    branches/bmesh/blender/extern/eltopo/common/collisionqueries.h
    branches/bmesh/blender/extern/eltopo/common/cubic_ccd_wrapper.cpp
    branches/bmesh/blender/extern/eltopo/common/fe_ccd_wrapper.cpp
    branches/bmesh/blender/extern/eltopo/common/fileio.cpp
    branches/bmesh/blender/extern/eltopo/common/fileio.h
    branches/bmesh/blender/extern/eltopo/common/gluvi.cpp
    branches/bmesh/blender/extern/eltopo/common/gluvi.h
    branches/bmesh/blender/extern/eltopo/common/grid3.h
    branches/bmesh/blender/extern/eltopo/common/hashtable.h
    branches/bmesh/blender/extern/eltopo/common/lapack_wrapper.h
    branches/bmesh/blender/extern/eltopo/common/levelset.cpp
    branches/bmesh/blender/extern/eltopo/common/levelset.h
    branches/bmesh/blender/extern/eltopo/common/makelevelset2.cpp
    branches/bmesh/blender/extern/eltopo/common/makelevelset2.h
    branches/bmesh/blender/extern/eltopo/common/makelevelset3.cpp
    branches/bmesh/blender/extern/eltopo/common/makelevelset3.h
    branches/bmesh/blender/extern/eltopo/common/marching_triangles.cpp
    branches/bmesh/blender/extern/eltopo/common/marching_triangles.h
    branches/bmesh/blender/extern/eltopo/common/mat.h
    branches/bmesh/blender/extern/eltopo/common/matlapack.h
    branches/bmesh/blender/extern/eltopo/common/meshes/
    branches/bmesh/blender/extern/eltopo/common/meshes/Edge.hpp
    branches/bmesh/blender/extern/eltopo/common/meshes/ObjLoader.cpp
    branches/bmesh/blender/extern/eltopo/common/meshes/ObjLoader.hpp
    branches/bmesh/blender/extern/eltopo/common/meshes/TriangleIndex.hpp
    branches/bmesh/blender/extern/eltopo/common/meshes/meshloader.cpp
    branches/bmesh/blender/extern/eltopo/common/meshes/meshloader.h
    branches/bmesh/blender/extern/eltopo/common/newsparse/
    branches/bmesh/blender/extern/eltopo/common/newsparse/dense_matrix.cpp
    branches/bmesh/blender/extern/eltopo/common/newsparse/dense_matrix.h
    branches/bmesh/blender/extern/eltopo/common/newsparse/krylov_solvers.cpp
    branches/bmesh/blender/extern/eltopo/common/newsparse/krylov_solvers.h
    branches/bmesh/blender/extern/eltopo/common/newsparse/linear_operator.h
    branches/bmesh/blender/extern/eltopo/common/newsparse/sparse_matrix.cpp
    branches/bmesh/blender/extern/eltopo/common/newsparse/sparse_matrix.h
    branches/bmesh/blender/extern/eltopo/common/openglutils.cpp
    branches/bmesh/blender/extern/eltopo/common/openglutils.h
    branches/bmesh/blender/extern/eltopo/common/predicates.cpp
    branches/bmesh/blender/extern/eltopo/common/predicates.h
    branches/bmesh/blender/extern/eltopo/common/sos_ccd_wrapper.cpp
    branches/bmesh/blender/extern/eltopo/common/sparse/
    branches/bmesh/blender/extern/eltopo/common/sparse/cgsolver.h
    branches/bmesh/blender/extern/eltopo/common/sparse/crsolver.h
    branches/bmesh/blender/extern/eltopo/common/sparse/incomplete_qr.cpp
    branches/bmesh/blender/extern/eltopo/common/sparse/incomplete_qr.h
    branches/bmesh/blender/extern/eltopo/common/sparse/sparseilu.h
    branches/bmesh/blender/extern/eltopo/common/sparse/sparsematrix.h
    branches/bmesh/blender/extern/eltopo/common/sparse/sparsemilu.h
    branches/bmesh/blender/extern/eltopo/common/tunicate/
    branches/bmesh/blender/extern/eltopo/common/tunicate/expansion.cpp
    branches/bmesh/blender/extern/eltopo/common/tunicate/expansion.h
    branches/bmesh/blender/extern/eltopo/common/tunicate/intersection.cpp
    branches/bmesh/blender/extern/eltopo/common/tunicate/neg.cpp
    branches/bmesh/blender/extern/eltopo/common/tunicate/neg.h
    branches/bmesh/blender/extern/eltopo/common/tunicate/orientation.cpp
    branches/bmesh/blender/extern/eltopo/common/tunicate/sos_intersection.cpp
    branches/bmesh/blender/extern/eltopo/common/tunicate/sos_orientation.cpp
    branches/bmesh/blender/extern/eltopo/common/tunicate/tunicate.h
    branches/bmesh/blender/extern/eltopo/common/util.h
    branches/bmesh/blender/extern/eltopo/common/vec.h
    branches/bmesh/blender/extern/eltopo/common/vector_math.h
    branches/bmesh/blender/extern/eltopo/common/wallclocktime.cpp
    branches/bmesh/blender/extern/eltopo/common/wallclocktime.h
    branches/bmesh/blender/extern/eltopo/eltopo-capi.cpp
    branches/bmesh/blender/extern/eltopo/eltopo-capi.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/
    branches/bmesh/blender/extern/eltopo/eltopo3d/Makefile
    branches/bmesh/blender/extern/eltopo/eltopo3d/Makefile.example_defs
    branches/bmesh/blender/extern/eltopo/eltopo3d/Makefile.inc
    branches/bmesh/blender/extern/eltopo/eltopo3d/Makefile.local_defs
    branches/bmesh/blender/extern/eltopo/eltopo3d/accelerationgrid.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/accelerationgrid.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/broadphase.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/broadphase_blenderbvh.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/broadphase_blenderbvh.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/broadphasegrid.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/broadphasegrid.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/dynamicsurface.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/dynamicsurface.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/eltopo.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/eltopo.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/nondestructivetrimesh.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/nondestructivetrimesh.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/obj/
    branches/bmesh/blender/extern/eltopo/eltopo3d/obj_debug/
    branches/bmesh/blender/extern/eltopo/eltopo3d/options.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/readme.txt
    branches/bmesh/blender/extern/eltopo/eltopo3d/subdivisionscheme.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/subdivisionscheme.h
    branches/bmesh/blender/extern/eltopo/eltopo3d/surftrack.cpp
    branches/bmesh/blender/extern/eltopo/eltopo3d/surftrack.h
    branches/bmesh/blender/extern/eltopo/readme.txt
    branches/bmesh/blender/intern/tools/cpifdiff.sh
    branches/bmesh/blender/intern/tools/cvs-tools/
    branches/bmesh/blender/intern/tools/tinderbox/
    branches/bmesh/blender/intern/tools/update-cvs/
    branches/bmesh/blender/release/datafiles/.Bfs
    branches/bmesh/blender/release/freedesktop/icons/128x128/
    branches/bmesh/blender/release/freedesktop/icons/16x16/apps/blender.png
    branches/bmesh/blender/release/freedesktop/icons/16x16/blender.png
    branches/bmesh/blender/release/freedesktop/icons/16x16/blender.svg
    branches/bmesh/blender/release/freedesktop/icons/192x192/
    branches/bmesh/blender/release/freedesktop/icons/22x22/apps/blender.png
    branches/bmesh/blender/release/freedesktop/icons/22x22/blender.png
    branches/bmesh/blender/release/freedesktop/icons/22x22/blender.svg
    branches/bmesh/blender/release/freedesktop/icons/24x24/apps/
    branches/bmesh/blender/release/freedesktop/icons/24x24/apps/blender.png
    branches/bmesh/blender/release/freedesktop/icons/256x256/apps/
    branches/bmesh/blender/release/freedesktop/icons/256x256/apps/blender.png
    branches/bmesh/blender/release/freedesktop/icons/32x32/apps/blender.png
    branches/bmesh/blender/release/freedesktop/icons/32x32/blender.png
    branches/bmesh/blender/release/freedesktop/icons/32x32/blender.svg
    branches/bmesh/blender/release/freedesktop/icons/48x48/apps/blender.png
    branches/bmesh/blender/release/freedesktop/icons/48x48/blender.png
    branches/bmesh/blender/release/freedesktop/icons/48x48/blender.svg
    branches/bmesh/blender/release/freedesktop/icons/64x64/
    branches/bmesh/blender/release/freedesktop/icons/96x96/
    branches/bmesh/blender/release/freedesktop/icons/scalable/apps/blender.svg
    branches/bmesh/blender/release/freedesktop/icons/scalable/blender.svg
    branches/bmesh/blender/source/blender/blenkernel/BKE_exotic.h
    branches/bmesh/blender/source/blender/blenkernel/intern/exotic.c
    branches/bmesh/blender/source/blender/blenlib/PIL_dynlib.h
    branches/bmesh/blender/source/kernel/
    branches/bmesh/blender/source/tools/to_dos
    branches/bmesh/blender/source/tools/to_unix

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
    branches/bmesh/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:31524-36153
   + /trunk/blender:31524-36529

Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt	2011-05-08 20:21:31 UTC (rev 36551)
+++ branches/bmesh/blender/CMakeLists.txt	2011-05-08 23:43:18 UTC (rev 36552)
@@ -31,15 +31,20 @@
 # build the libs and objects in it.
 
 if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
-message(FATAL_ERROR "CMake generation for blender is not allowed within the source directory! 
-Remove the CMakeCache.txt file and try again from another folder, e.g.: 
-
-	rm CMakeCache.txt 
-	cd ..
-	mkdir cmake-make 
-	cd cmake-make
-	cmake ../blender
-")
+	if(NOT DEFINED WITH_IN_SOURCE_BUILD)
+		message(FATAL_ERROR
+			"CMake generation for blender is not allowed within the source directory!"
+			"\n Remove the CMakeCache.txt file and try again from another folder, e.g.:"
+			"\n "
+			"\n rm CMakeCache.txt"
+			"\n cd .."
+			"\n mkdir cmake-make"
+			"\n cd cmake-make"
+			"\n cmake ../blender"
+			"\n "
+			"\n Alternately define WITH_IN_SOURCE_BUILD to force this option (not recommended!)"
+		)
+	endif()
 endif()
 
 cmake_minimum_required(VERSION 2.8)
@@ -97,8 +102,12 @@
 
 # Blender internal features
 option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
+
 option(WITH_PYTHON        "Enable Embedded Python API  (only disable for development)" ON)
+option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default (recommend to leave off)" OFF)
 mark_as_advanced(WITH_PYTHON)  # dont want people disabling this unless they really know what they are doing.
+mark_as_advanced(WITH_PYTHON_SECURITY)  # some distrobutions see this as a security issue, rather then have them patch it, make a build option.
+
 option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
 option(WITH_PYTHON_MODULE "Enable building as a python module (experemental, only enable for development)" OFF)
 option(WITH_BUILDINFO     "Include extra build details (only disable for development & faster builds)" ON)

Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct	2011-05-08 20:21:31 UTC (rev 36551)
+++ branches/bmesh/blender/SConstruct	2011-05-08 23:43:18 UTC (rev 36552)
@@ -568,9 +568,10 @@
 plugtargetlist.append(os.path.join(env['BF_INSTALLDIR'], VERSION, 'plugins', 'include', 'plugin.def'))
 
 plugininstall = []
-for targetdir,srcfile in zip(plugtargetlist, pluglist):
-    td, tf = os.path.split(targetdir)
-    plugininstall.append(env.Install(dir=td, source=srcfile))
+# plugins in blender 2.5 don't work at the moment.
+#for targetdir,srcfile in zip(plugtargetlist, pluglist):
+#    td, tf = os.path.split(targetdir)
+#    plugininstall.append(env.Install(dir=td, source=srcfile))
 
 textlist = []
 texttargetlist = []

Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py	2011-05-08 20:21:31 UTC (rev 36551)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py	2011-05-08 23:43:18 UTC (rev 36552)
@@ -1,5 +1,6 @@
 BF_BUILDDIR = '../blender-build/linux-glibc27-i686'
 BF_INSTALLDIR = '../blender-install/linux-glibc27-i686'
+BF_NUMJOBS = 2
 
 # Python configuration
 BF_PYTHON_VERSION = '3.2'
@@ -21,20 +22,14 @@
 WITH_BF_FFMPEG = True
 WITH_BF_STATICFFMPEG = True
 
-# Used for linking against system ffmpeg, but it gives pixelization,, so fall back to ffmpeg from 2.52 temporary
-#BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libavutil.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libdc1394.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libraw1394.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libfaad.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libspeex.a ${BF_FFMPEG_LIBPATH}/libbz2.a ${BF_FFMPEG_LIBPATH}/liboil-0.3.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libgsm.a'
-
 BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
 BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib32'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libextern_libavformat.a ${BF_FFMPEG_LIBPATH}/libextern_libswscale.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libextern_libavcodec.a ${BF_FFMPEG_LIBPATH}/libextern_libavdevice.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libextern_libavutil.a ${BF_FFMPEG_LIBPATH}/libextern_xvidcore.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libextern_libmp3lame.a ${BF_FFMPEG_LIBPATH}/libextern_x264.a'
+BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a'
 
 # Don't depend on system's libstdc++
 WITH_BF_STATICCXX = True

Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py	2011-05-08 20:21:31 UTC (rev 36551)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py	2011-05-08 23:43:18 UTC (rev 36552)
@@ -1,5 +1,6 @@
 BF_BUILDDIR = '../blender-build/linux-glibc27-i686'
 BF_INSTALLDIR = '../blender-install/linux-glibc27-i686'
+BF_NUMJOBS = 2
 
 # Python configuration
 BF_PYTHON_VERSION = '3.2'

Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py	2011-05-08 20:21:31 UTC (rev 36551)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py	2011-05-08 23:43:18 UTC (rev 36552)
@@ -1,5 +1,6 @@
 BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64'
 BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64'
+BF_NUMJOBS = 2
 
 # Python configuration
 BF_PYTHON_VERSION = '3.2'
@@ -46,7 +47,6 @@
 WITH_BF_STATICZLIB = True
 BF_ZLIB_LIB_STATIC = '${BF_ZLIB}/lib/libz.a'
 
-WITH_BF_STATICZLIB = False
 WITH_BF_SDL = True
 WITH_BF_OGG = False
 

Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py	2011-05-08 20:21:31 UTC (rev 36551)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py	2011-05-08 23:43:18 UTC (rev 36552)
@@ -1,5 +1,6 @@
 BF_BUILDDIR = '../blender-build/linux-glibc27-x86_64'
 BF_INSTALLDIR = '../blender-install/linux-glibc27-x86_64'
+BF_NUMJOBS = 2
 
 # Python configuration
 BF_PYTHON_VERSION = '3.2'
@@ -21,20 +22,14 @@
 WITH_BF_FFMPEG = True
 WITH_BF_STATICFFMPEG = True
 
-# Used for linking against system ffmpeg, but it gives pixelization,, so fall back to ffmpeg from 2.52 temporary
-#BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libavutil.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libdc1394.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libraw1394.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libfaad.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libspeex.a ${BF_FFMPEG_LIBPATH}/libbz2.a ${BF_FFMPEG_LIBPATH}/liboil-0.3.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
-#    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libgsm.a'
-
 BF_FFMPEG = '/home/sources/staticlibs/ffmpeg'
 BF_FFMPEG_LIBPATH = '${BF_FFMPEG}/lib64'
-BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libextern_libavformat.a ${BF_FFMPEG_LIBPATH}/libextern_libswscale.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libextern_libavcodec.a ${BF_FFMPEG_LIBPATH}/libextern_libavdevice.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libextern_libavutil.a ${BF_FFMPEG_LIBPATH}/libextern_xvidcore.a ' + \
-    '${BF_FFMPEG_LIBPATH}/libextern_libmp3lame.a ${BF_FFMPEG_LIBPATH}/libextern_x264.a'
+BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
+    '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a'
 
 # Don't depend on system's libstdc++
 WITH_BF_STATICCXX = True

Modified: branches/bmesh/blender/build_files/buildbot/slave_compile.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/slave_compile.py	2011-05-08 20:21:31 UTC (rev 36551)
+++ branches/bmesh/blender/build_files/buildbot/slave_compile.py	2011-05-08 23:43:18 UTC (rev 36552)
@@ -60,31 +60,14 @@
     if builder.startswith('linux'):
         import shutil
 
-        cores = 1
-        if hasattr(os, 'sysconf'):
-            if 'SC_NPROCESSORS_ONLN' in os.sysconf_names:

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list