[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36493] branches/particles-2010: svn merge -r36339:36492 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Lukas Toenne lukas.toenne at googlemail.com
Thu May 5 09:47:35 CEST 2011


Revision: 36493
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36493
Author:   lukastoenne
Date:     2011-05-05 07:47:34 +0000 (Thu, 05 May 2011)
Log Message:
-----------
svn merge -r36339:36492 https://svn.blender.org/svnroot/bf-blender/trunk/blender

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

Modified Paths:
--------------
    branches/particles-2010/CMakeLists.txt
    branches/particles-2010/build_files/buildbot/config/user-config-i686.py
    branches/particles-2010/build_files/buildbot/config/user-config-x86_64.py
    branches/particles-2010/build_files/package_spec/debian/menu
    branches/particles-2010/build_files/scons/tools/btools.py
    branches/particles-2010/doc/python_api/examples/bpy.types.Operator.1.py
    branches/particles-2010/extern/CMakeLists.txt
    branches/particles-2010/extern/SConscript
    branches/particles-2010/intern/ghost/GHOST_C-api.h
    branches/particles-2010/intern/ghost/GHOST_ISystem.h
    branches/particles-2010/intern/ghost/intern/GHOST_C-api.cpp
    branches/particles-2010/intern/ghost/intern/GHOST_Debug.h
    branches/particles-2010/intern/ghost/intern/GHOST_SystemCarbon.h
    branches/particles-2010/intern/ghost/intern/GHOST_SystemCocoa.h
    branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/particles-2010/intern/ghost/intern/GHOST_SystemWin32.h
    branches/particles-2010/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/particles-2010/intern/ghost/intern/GHOST_SystemX11.h
    branches/particles-2010/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/particles-2010/intern/ghost/intern/GHOST_WindowWin32.h
    branches/particles-2010/intern/ghost/test/gears/GHOST_C-Test.c
    branches/particles-2010/intern/guardedalloc/MEM_sys_types.h
    branches/particles-2010/intern/opennl/superlu/superlu_sys_types.h
    branches/particles-2010/release/scripts/modules/bpy/utils.py
    branches/particles-2010/release/scripts/presets/interaction/blender.py
    branches/particles-2010/release/scripts/presets/interaction/maya.py
    branches/particles-2010/release/scripts/startup/bl_operators/mesh.py
    branches/particles-2010/release/scripts/startup/bl_operators/presets.py
    branches/particles-2010/release/scripts/startup/bl_operators/wm.py
    branches/particles-2010/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/particles-2010/release/scripts/startup/bl_ui/properties_game.py
    branches/particles-2010/release/scripts/startup/bl_ui/properties_material.py
    branches/particles-2010/release/scripts/startup/bl_ui/properties_physics_cloth.py
    branches/particles-2010/release/scripts/startup/bl_ui/properties_texture.py
    branches/particles-2010/release/scripts/startup/bl_ui/space_image.py
    branches/particles-2010/release/scripts/startup/bl_ui/space_userpref.py
    branches/particles-2010/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/particles-2010/release/scripts/startup/bl_ui/space_view3d.py
    branches/particles-2010/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/particles-2010/release/scripts/templates/operator_export.py
    branches/particles-2010/source/blender/blenfont/BLF_api.h
    branches/particles-2010/source/blender/blenfont/intern/blf.c
    branches/particles-2010/source/blender/blenfont/intern/blf_font.c
    branches/particles-2010/source/blender/blenfont/intern/blf_internal_types.h
    branches/particles-2010/source/blender/blenkernel/BKE_cloth.h
    branches/particles-2010/source/blender/blenkernel/BKE_collision.h
    branches/particles-2010/source/blender/blenkernel/BKE_image.h
    branches/particles-2010/source/blender/blenkernel/BKE_sequencer.h
    branches/particles-2010/source/blender/blenkernel/BKE_shrinkwrap.h
    branches/particles-2010/source/blender/blenkernel/CMakeLists.txt
    branches/particles-2010/source/blender/blenkernel/SConscript
    branches/particles-2010/source/blender/blenkernel/intern/DerivedMesh.c
    branches/particles-2010/source/blender/blenkernel/intern/action.c
    branches/particles-2010/source/blender/blenkernel/intern/anim_sys.c
    branches/particles-2010/source/blender/blenkernel/intern/blender.c
    branches/particles-2010/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/particles-2010/source/blender/blenkernel/intern/cloth.c
    branches/particles-2010/source/blender/blenkernel/intern/collision.c
    branches/particles-2010/source/blender/blenkernel/intern/constraint.c
    branches/particles-2010/source/blender/blenkernel/intern/context.c
    branches/particles-2010/source/blender/blenkernel/intern/depsgraph.c
    branches/particles-2010/source/blender/blenkernel/intern/font.c
    branches/particles-2010/source/blender/blenkernel/intern/idprop.c
    branches/particles-2010/source/blender/blenkernel/intern/image.c
    branches/particles-2010/source/blender/blenkernel/intern/implicit.c
    branches/particles-2010/source/blender/blenkernel/intern/library.c
    branches/particles-2010/source/blender/blenkernel/intern/node.c
    branches/particles-2010/source/blender/blenkernel/intern/object.c
    branches/particles-2010/source/blender/blenkernel/intern/particle.c
    branches/particles-2010/source/blender/blenkernel/intern/pointcache.c
    branches/particles-2010/source/blender/blenkernel/intern/sequencer.c
    branches/particles-2010/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/particles-2010/source/blender/blenkernel/intern/texture.c
    branches/particles-2010/source/blender/blenlib/BLI_listbase.h
    branches/particles-2010/source/blender/blenlib/BLI_math_geom.h
    branches/particles-2010/source/blender/blenlib/BLI_path_util.h
    branches/particles-2010/source/blender/blenlib/BLI_winstuff.h
    branches/particles-2010/source/blender/blenlib/intern/listbase.c
    branches/particles-2010/source/blender/blenlib/intern/math_geom.c
    branches/particles-2010/source/blender/blenlib/intern/math_vector_inline.c
    branches/particles-2010/source/blender/blenlib/intern/path_util.c
    branches/particles-2010/source/blender/blenlib/intern/winstuff.c
    branches/particles-2010/source/blender/blenloader/intern/readblenentry.c
    branches/particles-2010/source/blender/blenloader/intern/readfile.c
    branches/particles-2010/source/blender/blenloader/intern/writefile.c
    branches/particles-2010/source/blender/editors/armature/editarmature.c
    branches/particles-2010/source/blender/editors/curve/editcurve.c
    branches/particles-2010/source/blender/editors/datafiles/startup.blend.c
    branches/particles-2010/source/blender/editors/gpencil/drawgpencil.c
    branches/particles-2010/source/blender/editors/gpencil/gpencil_paint.c
    branches/particles-2010/source/blender/editors/include/ED_uvedit.h
    branches/particles-2010/source/blender/editors/include/ED_view3d.h
    branches/particles-2010/source/blender/editors/include/UI_interface.h
    branches/particles-2010/source/blender/editors/interface/interface.c
    branches/particles-2010/source/blender/editors/interface/interface_draw.c
    branches/particles-2010/source/blender/editors/interface/interface_handlers.c
    branches/particles-2010/source/blender/editors/interface/interface_regions.c
    branches/particles-2010/source/blender/editors/interface/interface_widgets.c
    branches/particles-2010/source/blender/editors/mesh/editmesh_add.c
    branches/particles-2010/source/blender/editors/mesh/editmesh_mods.c
    branches/particles-2010/source/blender/editors/mesh/editmesh_tools.c
    branches/particles-2010/source/blender/editors/mesh/mesh_data.c
    branches/particles-2010/source/blender/editors/mesh/mesh_ops.c
    branches/particles-2010/source/blender/editors/object/object_constraint.c
    branches/particles-2010/source/blender/editors/object/object_intern.h
    branches/particles-2010/source/blender/editors/object/object_ops.c
    branches/particles-2010/source/blender/editors/object/object_transform.c
    branches/particles-2010/source/blender/editors/render/render_internal.c
    branches/particles-2010/source/blender/editors/render/render_opengl.c
    branches/particles-2010/source/blender/editors/render/render_preview.c
    branches/particles-2010/source/blender/editors/render/render_shading.c
    branches/particles-2010/source/blender/editors/screen/screen_ops.c
    branches/particles-2010/source/blender/editors/screen/screendump.c
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_image.c
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_ops.c
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/particles-2010/source/blender/editors/sculpt_paint/sculpt.c
    branches/particles-2010/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/particles-2010/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/particles-2010/source/blender/editors/space_file/file_draw.c
    branches/particles-2010/source/blender/editors/space_file/filelist.c
    branches/particles-2010/source/blender/editors/space_graph/graph_select.c
    branches/particles-2010/source/blender/editors/space_image/CMakeLists.txt
    branches/particles-2010/source/blender/editors/space_image/image_buttons.c
    branches/particles-2010/source/blender/editors/space_image/image_ops.c
    branches/particles-2010/source/blender/editors/space_image/space_image.c
    branches/particles-2010/source/blender/editors/space_node/drawnode.c
    branches/particles-2010/source/blender/editors/space_node/node_edit.c
    branches/particles-2010/source/blender/editors/space_node/node_header.c
    branches/particles-2010/source/blender/editors/space_node/node_intern.h
    branches/particles-2010/source/blender/editors/space_time/time_ops.c
    branches/particles-2010/source/blender/editors/space_view3d/drawarmature.c
    branches/particles-2010/source/blender/editors/space_view3d/drawobject.c
    branches/particles-2010/source/blender/editors/space_view3d/space_view3d.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_draw.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_edit.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_fly.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_header.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_intern.h
    branches/particles-2010/source/blender/editors/space_view3d/view3d_view.c
    branches/particles-2010/source/blender/editors/transform/transform.c
    branches/particles-2010/source/blender/editors/transform/transform_constraints.c
    branches/particles-2010/source/blender/editors/transform/transform_conversions.c
    branches/particles-2010/source/blender/editors/transform/transform_generics.c
    branches/particles-2010/source/blender/editors/transform/transform_input.c
    branches/particles-2010/source/blender/editors/transform/transform_snap.c
    branches/particles-2010/source/blender/editors/util/crazyspace.c
    branches/particles-2010/source/blender/editors/uvedit/CMakeLists.txt
    branches/particles-2010/source/blender/editors/uvedit/uvedit_ops.c
    branches/particles-2010/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/particles-2010/source/blender/gpu/intern/gpu_material.c
    branches/particles-2010/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/particles-2010/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/particles-2010/source/blender/imbuf/IMB_thumbs.h
    branches/particles-2010/source/blender/imbuf/intern/thumbs.c
    branches/particles-2010/source/blender/makesdna/DNA_cloth_types.h
    branches/particles-2010/source/blender/makesdna/DNA_modifier_types.h
    branches/particles-2010/source/blender/makesdna/DNA_scene_types.h
    branches/particles-2010/source/blender/makesdna/DNA_texture_types.h
    branches/particles-2010/source/blender/makesrna/RNA_access.h
    branches/particles-2010/source/blender/makesrna/intern/rna_access.c
    branches/particles-2010/source/blender/makesrna/intern/rna_animation.c
    branches/particles-2010/source/blender/makesrna/intern/rna_brush.c
    branches/particles-2010/source/blender/makesrna/intern/rna_cloth.c
    branches/particles-2010/source/blender/makesrna/intern/rna_image.c
    branches/particles-2010/source/blender/makesrna/intern/rna_image_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_modifier.c
    branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
    branches/particles-2010/source/blender/makesrna/intern/rna_object.c
    branches/particles-2010/source/blender/makesrna/intern/rna_object_force.c
    branches/particles-2010/source/blender/makesrna/intern/rna_pose.c
    branches/particles-2010/source/blender/makesrna/intern/rna_scene.c
    branches/particles-2010/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/particles-2010/source/blender/makesrna/intern/rna_space.c
    branches/particles-2010/source/blender/makesrna/intern/rna_texture.c
    branches/particles-2010/source/blender/makesrna/intern/rna_ui_api.c
    branches/particles-2010/source/blender/modifiers/CMakeLists.txt
    branches/particles-2010/source/blender/modifiers/MOD_modifiertypes.h
    branches/particles-2010/source/blender/modifiers/intern/MOD_displace.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_multires.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_simpledeform.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_util.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_util.h
    branches/particles-2010/source/blender/modifiers/intern/MOD_wave.c
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
    branches/particles-2010/source/blender/python/intern/bpy_interface.c
    branches/particles-2010/source/blender/python/intern/bpy_library.c
    branches/particles-2010/source/blender/python/intern/bpy_operator.c
    branches/particles-2010/source/blender/python/intern/bpy_props.c
    branches/particles-2010/source/blender/python/intern/bpy_rna.c
    branches/particles-2010/source/blender/python/intern/bpy_rna_anim.c
    branches/particles-2010/source/blender/python/intern/bpy_traceback.c
    branches/particles-2010/source/blender/python/intern/bpy_util.c
    branches/particles-2010/source/blender/render/extern/include/RE_pipeline.h
    branches/particles-2010/source/blender/render/intern/include/render_types.h
    branches/particles-2010/source/blender/render/intern/raytrace/reorganize.h
    branches/particles-2010/source/blender/render/intern/source/convertblender.c
    branches/particles-2010/source/blender/render/intern/source/initrender.c
    branches/particles-2010/source/blender/render/intern/source/pipeline.c
    branches/particles-2010/source/blender/render/intern/source/pointdensity.c
    branches/particles-2010/source/blender/render/intern/source/render_texture.c
    branches/particles-2010/source/blender/render/intern/source/shadeoutput.c
    branches/particles-2010/source/blender/render/intern/source/volume_precache.c
    branches/particles-2010/source/blender/windowmanager/CMakeLists.txt
    branches/particles-2010/source/blender/windowmanager/intern/wm_files.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_init_exit.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_operators.c
    branches/particles-2010/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/particles-2010/source/creator/CMakeLists.txt
    branches/particles-2010/source/creator/creator.c
    branches/particles-2010/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/particles-2010/source/gameengine/GamePlayer/ghost/GPG_Application.h
    branches/particles-2010/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/particles-2010/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

Added Paths:
-----------
    branches/particles-2010/extern/eltopo/
    branches/particles-2010/extern/eltopo/CMakeLists.txt
    branches/particles-2010/extern/eltopo/SConscript
    branches/particles-2010/extern/eltopo/common/
    branches/particles-2010/extern/eltopo/common/array1.h
    branches/particles-2010/extern/eltopo/common/array2.h
    branches/particles-2010/extern/eltopo/common/array3.h
    branches/particles-2010/extern/eltopo/common/array3_utils.h
    branches/particles-2010/extern/eltopo/common/bfstream.cpp
    branches/particles-2010/extern/eltopo/common/bfstream.h
    branches/particles-2010/extern/eltopo/common/blas_wrapper.h
    branches/particles-2010/extern/eltopo/common/ccd_wrapper.cpp
    branches/particles-2010/extern/eltopo/common/ccd_wrapper.h
    branches/particles-2010/extern/eltopo/common/clamped_spline.cpp
    branches/particles-2010/extern/eltopo/common/clamped_spline.h
    branches/particles-2010/extern/eltopo/common/collisionqueries.cpp
    branches/particles-2010/extern/eltopo/common/collisionqueries.h
    branches/particles-2010/extern/eltopo/common/cubic_ccd_wrapper.cpp
    branches/particles-2010/extern/eltopo/common/fe_ccd_wrapper.cpp
    branches/particles-2010/extern/eltopo/common/fileio.cpp
    branches/particles-2010/extern/eltopo/common/fileio.h
    branches/particles-2010/extern/eltopo/common/gluvi.cpp
    branches/particles-2010/extern/eltopo/common/gluvi.h
    branches/particles-2010/extern/eltopo/common/grid3.h
    branches/particles-2010/extern/eltopo/common/hashtable.h
    branches/particles-2010/extern/eltopo/common/lapack_wrapper.h
    branches/particles-2010/extern/eltopo/common/levelset.cpp
    branches/particles-2010/extern/eltopo/common/levelset.h
    branches/particles-2010/extern/eltopo/common/makelevelset2.cpp
    branches/particles-2010/extern/eltopo/common/makelevelset2.h
    branches/particles-2010/extern/eltopo/common/makelevelset3.cpp
    branches/particles-2010/extern/eltopo/common/makelevelset3.h
    branches/particles-2010/extern/eltopo/common/marching_triangles.cpp
    branches/particles-2010/extern/eltopo/common/marching_triangles.h
    branches/particles-2010/extern/eltopo/common/mat.h
    branches/particles-2010/extern/eltopo/common/matlapack.h
    branches/particles-2010/extern/eltopo/common/meshes/
    branches/particles-2010/extern/eltopo/common/meshes/Edge.hpp
    branches/particles-2010/extern/eltopo/common/meshes/ObjLoader.cpp
    branches/particles-2010/extern/eltopo/common/meshes/ObjLoader.hpp
    branches/particles-2010/extern/eltopo/common/meshes/TriangleIndex.hpp
    branches/particles-2010/extern/eltopo/common/meshes/meshloader.cpp
    branches/particles-2010/extern/eltopo/common/meshes/meshloader.h
    branches/particles-2010/extern/eltopo/common/newsparse/
    branches/particles-2010/extern/eltopo/common/newsparse/dense_matrix.cpp
    branches/particles-2010/extern/eltopo/common/newsparse/dense_matrix.h
    branches/particles-2010/extern/eltopo/common/newsparse/krylov_solvers.cpp
    branches/particles-2010/extern/eltopo/common/newsparse/krylov_solvers.h
    branches/particles-2010/extern/eltopo/common/newsparse/linear_operator.h
    branches/particles-2010/extern/eltopo/common/newsparse/sparse_matrix.cpp
    branches/particles-2010/extern/eltopo/common/newsparse/sparse_matrix.h
    branches/particles-2010/extern/eltopo/common/openglutils.cpp
    branches/particles-2010/extern/eltopo/common/openglutils.h
    branches/particles-2010/extern/eltopo/common/predicates.cpp
    branches/particles-2010/extern/eltopo/common/predicates.h
    branches/particles-2010/extern/eltopo/common/sos_ccd_wrapper.cpp
    branches/particles-2010/extern/eltopo/common/sparse/
    branches/particles-2010/extern/eltopo/common/sparse/cgsolver.h
    branches/particles-2010/extern/eltopo/common/sparse/crsolver.h
    branches/particles-2010/extern/eltopo/common/sparse/incomplete_qr.cpp
    branches/particles-2010/extern/eltopo/common/sparse/incomplete_qr.h
    branches/particles-2010/extern/eltopo/common/sparse/sparseilu.h
    branches/particles-2010/extern/eltopo/common/sparse/sparsematrix.h
    branches/particles-2010/extern/eltopo/common/sparse/sparsemilu.h
    branches/particles-2010/extern/eltopo/common/tunicate/
    branches/particles-2010/extern/eltopo/common/tunicate/expansion.cpp
    branches/particles-2010/extern/eltopo/common/tunicate/expansion.h
    branches/particles-2010/extern/eltopo/common/tunicate/intersection.cpp
    branches/particles-2010/extern/eltopo/common/tunicate/neg.cpp
    branches/particles-2010/extern/eltopo/common/tunicate/neg.h
    branches/particles-2010/extern/eltopo/common/tunicate/orientation.cpp
    branches/particles-2010/extern/eltopo/common/tunicate/sos_intersection.cpp
    branches/particles-2010/extern/eltopo/common/tunicate/sos_orientation.cpp
    branches/particles-2010/extern/eltopo/common/tunicate/tunicate.h
    branches/particles-2010/extern/eltopo/common/util.h
    branches/particles-2010/extern/eltopo/common/vec.h
    branches/particles-2010/extern/eltopo/common/vector_math.h
    branches/particles-2010/extern/eltopo/common/wallclocktime.cpp
    branches/particles-2010/extern/eltopo/common/wallclocktime.h
    branches/particles-2010/extern/eltopo/eltopo-capi.cpp
    branches/particles-2010/extern/eltopo/eltopo-capi.h
    branches/particles-2010/extern/eltopo/eltopo3d/
    branches/particles-2010/extern/eltopo/eltopo3d/Makefile
    branches/particles-2010/extern/eltopo/eltopo3d/Makefile.example_defs
    branches/particles-2010/extern/eltopo/eltopo3d/Makefile.inc
    branches/particles-2010/extern/eltopo/eltopo3d/Makefile.local_defs
    branches/particles-2010/extern/eltopo/eltopo3d/accelerationgrid.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/accelerationgrid.h
    branches/particles-2010/extern/eltopo/eltopo3d/broadphase.h
    branches/particles-2010/extern/eltopo/eltopo3d/broadphase_blenderbvh.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/broadphase_blenderbvh.h
    branches/particles-2010/extern/eltopo/eltopo3d/broadphasegrid.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/broadphasegrid.h
    branches/particles-2010/extern/eltopo/eltopo3d/dynamicsurface.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/dynamicsurface.h
    branches/particles-2010/extern/eltopo/eltopo3d/eltopo.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/eltopo.h
    branches/particles-2010/extern/eltopo/eltopo3d/nondestructivetrimesh.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/nondestructivetrimesh.h
    branches/particles-2010/extern/eltopo/eltopo3d/obj/
    branches/particles-2010/extern/eltopo/eltopo3d/obj_debug/
    branches/particles-2010/extern/eltopo/eltopo3d/options.h
    branches/particles-2010/extern/eltopo/eltopo3d/readme.txt
    branches/particles-2010/extern/eltopo/eltopo3d/subdivisionscheme.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/subdivisionscheme.h
    branches/particles-2010/extern/eltopo/eltopo3d/surftrack.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/surftrack.h
    branches/particles-2010/extern/eltopo/readme.txt
    branches/particles-2010/source/blender/editors/uvedit/uvedit_buttons.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_warp.c

Removed Paths:
-------------
    branches/particles-2010/extern/bullet2/uninitialized_stack_vec.patch
    branches/particles-2010/extern/eltopo/CMakeLists.txt
    branches/particles-2010/extern/eltopo/SConscript
    branches/particles-2010/extern/eltopo/common/
    branches/particles-2010/extern/eltopo/common/array1.h
    branches/particles-2010/extern/eltopo/common/array2.h
    branches/particles-2010/extern/eltopo/common/array3.h
    branches/particles-2010/extern/eltopo/common/array3_utils.h
    branches/particles-2010/extern/eltopo/common/bfstream.cpp
    branches/particles-2010/extern/eltopo/common/bfstream.h
    branches/particles-2010/extern/eltopo/common/blas_wrapper.h
    branches/particles-2010/extern/eltopo/common/ccd_wrapper.cpp
    branches/particles-2010/extern/eltopo/common/ccd_wrapper.h
    branches/particles-2010/extern/eltopo/common/clamped_spline.cpp
    branches/particles-2010/extern/eltopo/common/clamped_spline.h
    branches/particles-2010/extern/eltopo/common/collisionqueries.cpp
    branches/particles-2010/extern/eltopo/common/collisionqueries.h
    branches/particles-2010/extern/eltopo/common/cubic_ccd_wrapper.cpp
    branches/particles-2010/extern/eltopo/common/fe_ccd_wrapper.cpp
    branches/particles-2010/extern/eltopo/common/fileio.cpp
    branches/particles-2010/extern/eltopo/common/fileio.h
    branches/particles-2010/extern/eltopo/common/gluvi.cpp
    branches/particles-2010/extern/eltopo/common/gluvi.h
    branches/particles-2010/extern/eltopo/common/grid3.h
    branches/particles-2010/extern/eltopo/common/hashtable.h
    branches/particles-2010/extern/eltopo/common/lapack_wrapper.h
    branches/particles-2010/extern/eltopo/common/levelset.cpp
    branches/particles-2010/extern/eltopo/common/levelset.h
    branches/particles-2010/extern/eltopo/common/makelevelset2.cpp
    branches/particles-2010/extern/eltopo/common/makelevelset2.h
    branches/particles-2010/extern/eltopo/common/makelevelset3.cpp
    branches/particles-2010/extern/eltopo/common/makelevelset3.h
    branches/particles-2010/extern/eltopo/common/marching_triangles.cpp
    branches/particles-2010/extern/eltopo/common/marching_triangles.h
    branches/particles-2010/extern/eltopo/common/mat.h
    branches/particles-2010/extern/eltopo/common/matlapack.h
    branches/particles-2010/extern/eltopo/common/meshes/
    branches/particles-2010/extern/eltopo/common/meshes/Edge.hpp
    branches/particles-2010/extern/eltopo/common/meshes/ObjLoader.cpp
    branches/particles-2010/extern/eltopo/common/meshes/ObjLoader.hpp
    branches/particles-2010/extern/eltopo/common/meshes/TriangleIndex.hpp
    branches/particles-2010/extern/eltopo/common/meshes/meshloader.cpp
    branches/particles-2010/extern/eltopo/common/meshes/meshloader.h
    branches/particles-2010/extern/eltopo/common/newsparse/
    branches/particles-2010/extern/eltopo/common/newsparse/dense_matrix.cpp
    branches/particles-2010/extern/eltopo/common/newsparse/dense_matrix.h
    branches/particles-2010/extern/eltopo/common/newsparse/krylov_solvers.cpp
    branches/particles-2010/extern/eltopo/common/newsparse/krylov_solvers.h
    branches/particles-2010/extern/eltopo/common/newsparse/linear_operator.h
    branches/particles-2010/extern/eltopo/common/newsparse/sparse_matrix.cpp
    branches/particles-2010/extern/eltopo/common/newsparse/sparse_matrix.h
    branches/particles-2010/extern/eltopo/common/openglutils.cpp
    branches/particles-2010/extern/eltopo/common/openglutils.h
    branches/particles-2010/extern/eltopo/common/predicates.cpp
    branches/particles-2010/extern/eltopo/common/predicates.h
    branches/particles-2010/extern/eltopo/common/sos_ccd_wrapper.cpp
    branches/particles-2010/extern/eltopo/common/sparse/
    branches/particles-2010/extern/eltopo/common/sparse/cgsolver.h
    branches/particles-2010/extern/eltopo/common/sparse/crsolver.h
    branches/particles-2010/extern/eltopo/common/sparse/incomplete_qr.cpp
    branches/particles-2010/extern/eltopo/common/sparse/incomplete_qr.h
    branches/particles-2010/extern/eltopo/common/sparse/sparseilu.h
    branches/particles-2010/extern/eltopo/common/sparse/sparsematrix.h
    branches/particles-2010/extern/eltopo/common/sparse/sparsemilu.h
    branches/particles-2010/extern/eltopo/common/tunicate/
    branches/particles-2010/extern/eltopo/common/tunicate/expansion.cpp
    branches/particles-2010/extern/eltopo/common/tunicate/expansion.h
    branches/particles-2010/extern/eltopo/common/tunicate/intersection.cpp
    branches/particles-2010/extern/eltopo/common/tunicate/neg.cpp
    branches/particles-2010/extern/eltopo/common/tunicate/neg.h
    branches/particles-2010/extern/eltopo/common/tunicate/orientation.cpp
    branches/particles-2010/extern/eltopo/common/tunicate/sos_intersection.cpp
    branches/particles-2010/extern/eltopo/common/tunicate/sos_orientation.cpp
    branches/particles-2010/extern/eltopo/common/tunicate/tunicate.h
    branches/particles-2010/extern/eltopo/common/util.h
    branches/particles-2010/extern/eltopo/common/vec.h
    branches/particles-2010/extern/eltopo/common/vector_math.h
    branches/particles-2010/extern/eltopo/common/wallclocktime.cpp
    branches/particles-2010/extern/eltopo/common/wallclocktime.h
    branches/particles-2010/extern/eltopo/eltopo-capi.cpp
    branches/particles-2010/extern/eltopo/eltopo-capi.h
    branches/particles-2010/extern/eltopo/eltopo3d/
    branches/particles-2010/extern/eltopo/eltopo3d/Makefile
    branches/particles-2010/extern/eltopo/eltopo3d/Makefile.example_defs
    branches/particles-2010/extern/eltopo/eltopo3d/Makefile.inc
    branches/particles-2010/extern/eltopo/eltopo3d/Makefile.local_defs
    branches/particles-2010/extern/eltopo/eltopo3d/accelerationgrid.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/accelerationgrid.h
    branches/particles-2010/extern/eltopo/eltopo3d/broadphase.h
    branches/particles-2010/extern/eltopo/eltopo3d/broadphase_blenderbvh.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/broadphase_blenderbvh.h
    branches/particles-2010/extern/eltopo/eltopo3d/broadphasegrid.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/broadphasegrid.h
    branches/particles-2010/extern/eltopo/eltopo3d/dynamicsurface.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/dynamicsurface.h
    branches/particles-2010/extern/eltopo/eltopo3d/eltopo.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/eltopo.h
    branches/particles-2010/extern/eltopo/eltopo3d/nondestructivetrimesh.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/nondestructivetrimesh.h
    branches/particles-2010/extern/eltopo/eltopo3d/obj/
    branches/particles-2010/extern/eltopo/eltopo3d/obj_debug/
    branches/particles-2010/extern/eltopo/eltopo3d/options.h
    branches/particles-2010/extern/eltopo/eltopo3d/readme.txt
    branches/particles-2010/extern/eltopo/eltopo3d/subdivisionscheme.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/subdivisionscheme.h
    branches/particles-2010/extern/eltopo/eltopo3d/surftrack.cpp
    branches/particles-2010/extern/eltopo/eltopo3d/surftrack.h
    branches/particles-2010/extern/eltopo/readme.txt
    branches/particles-2010/release/datafiles/.Bfs
    branches/particles-2010/source/blender/editors/space_image/image_header.c
    branches/particles-2010/source/tools/to_dos
    branches/particles-2010/source/tools/to_unix

Property Changed:
----------------
    branches/particles-2010/


Property changes on: branches/particles-2010
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:33741-36339
   + /trunk/blender:33741-36492

Modified: branches/particles-2010/CMakeLists.txt
===================================================================
--- branches/particles-2010/CMakeLists.txt	2011-05-05 07:12:19 UTC (rev 36492)
+++ branches/particles-2010/CMakeLists.txt	2011-05-05 07:47:34 UTC (rev 36493)
@@ -102,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/particles-2010/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/particles-2010/build_files/buildbot/config/user-config-i686.py	2011-05-05 07:12:19 UTC (rev 36492)
+++ branches/particles-2010/build_files/buildbot/config/user-config-i686.py	2011-05-05 07:47:34 UTC (rev 36493)
@@ -22,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/particles-2010/build_files/buildbot/config/user-config-x86_64.py
===================================================================
--- branches/particles-2010/build_files/buildbot/config/user-config-x86_64.py	2011-05-05 07:12:19 UTC (rev 36492)
+++ branches/particles-2010/build_files/buildbot/config/user-config-x86_64.py	2011-05-05 07:47:34 UTC (rev 36493)
@@ -22,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/particles-2010/build_files/package_spec/debian/menu
===================================================================
--- branches/particles-2010/build_files/package_spec/debian/menu	2011-05-05 07:12:19 UTC (rev 36492)
+++ branches/particles-2010/build_files/package_spec/debian/menu	2011-05-05 07:47:34 UTC (rev 36493)
@@ -1,4 +1,4 @@
 ?package(blender-snapshot):needs="X11" section="Applications/Graphics"\
   longtitle="Blender 3D modeler / renderer"\
-  icon="/usr/share/pixmaps/blender.svg"\
+  icon="/usr/share/icons/hicolor/scalable/apps/blender.svg"\
   title="blender" command="/usr/bin/blender"

Modified: branches/particles-2010/build_files/scons/tools/btools.py
===================================================================
--- branches/particles-2010/build_files/scons/tools/btools.py	2011-05-05 07:12:19 UTC (rev 36492)
+++ branches/particles-2010/build_files/scons/tools/btools.py	2011-05-05 07:47:34 UTC (rev 36493)
@@ -99,7 +99,7 @@
             'WITH_BF_INTERNATIONAL',
             'BF_GETTEXT', 'BF_GETTEXT_INC', 'BF_GETTEXT_LIB', 'WITH_BF_GETTEXT_STATIC', 'BF_GETTEXT_LIB_STATIC', 'BF_GETTEXT_LIBPATH',
             'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH',
-            'WITH_BF_GAMEENGINE', 'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
+            'WITH_BF_GAMEENGINE', 'WITH_BF_BULLET', 'WITH_BF_ELTOPO', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB',
             'BF_WINTAB', 'BF_WINTAB_INC',
             'WITH_BF_FREETYPE', 'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', 'BF_FREETYPE_LIB_STATIC', 'WITH_BF_FREETYPE_STATIC',
             'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH',
@@ -365,6 +365,8 @@
         (BoolVariable('WITH_BF_GAMEENGINE', 'Build with gameengine' , False)),
 
         (BoolVariable('WITH_BF_BULLET', 'Use Bullet if true', True)),
+        (BoolVariable('WITH_BF_ELTOPO', 'Use Eltopo collision library if true', False)),
+        
         ('BF_BULLET', 'Bullet base dir', ''),
         ('BF_BULLET_INC', 'Bullet include path', ''),
         ('BF_BULLET_LIB', 'Bullet library', ''),

Modified: branches/particles-2010/doc/python_api/examples/bpy.types.Operator.1.py
===================================================================
--- branches/particles-2010/doc/python_api/examples/bpy.types.Operator.1.py	2011-05-05 07:12:19 UTC (rev 36492)
+++ branches/particles-2010/doc/python_api/examples/bpy.types.Operator.1.py	2011-05-05 07:47:34 UTC (rev 36493)
@@ -32,7 +32,7 @@
 
     def execute(self, context):
         # rather then printing, use the report function,
-        # this way the messag appiers in the header,
+        # this way the message appears in the header,
         self.report({'INFO'}, "Mouse coords are %d %d" % (self.x, self.y))
         return {'FINISHED'}
 

Modified: branches/particles-2010/extern/CMakeLists.txt
===================================================================
--- branches/particles-2010/extern/CMakeLists.txt	2011-05-05 07:12:19 UTC (rev 36492)
+++ branches/particles-2010/extern/CMakeLists.txt	2011-05-05 07:47:34 UTC (rev 36493)
@@ -31,6 +31,10 @@
 	add_subdirectory(bullet2)
 endif()
 
+if(WITH_MOD_CLOTH_ELTOPO)
+	add_subdirectory(eltopo)
+endif()
+
 if(WITH_BINRELOC)
 	add_subdirectory(binreloc)
 endif()

Modified: branches/particles-2010/extern/SConscript
===================================================================
--- branches/particles-2010/extern/SConscript	2011-05-05 07:12:19 UTC (rev 36492)
+++ branches/particles-2010/extern/SConscript	2011-05-05 07:47:34 UTC (rev 36493)
@@ -4,6 +4,9 @@
 
 SConscript(['glew/SConscript'])
 
+if env['WITH_BF_ELTOPO']:
+    SConscript(['eltopo/SConscript'])
+
 if env['WITH_BF_BULLET']:
     SConscript(['bullet2/src/SConscript'])
 

Deleted: branches/particles-2010/extern/bullet2/uninitialized_stack_vec.patch

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list