[ovito] 04/10: Merge tag 'upstream/2.8.1+dfsg2'
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Fri Jan 13 20:38:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository ovito.
commit 640fe431d7f552c30905e1e8c3e57c43f5b9d817
Merge: ea3daac 4d2618b
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Fri Jan 13 15:33:50 2017 +0000
Merge tag 'upstream/2.8.1+dfsg2'
Upstream version 2.8.1+dfsg2
src/3rdparty/pybind11/LICENSE | 36 -
src/3rdparty/pybind11/README.md | 123 -
src/3rdparty/pybind11/attr.h | 362 -
src/3rdparty/pybind11/cast.h | 1456 ----
src/3rdparty/pybind11/chrono.h | 160 -
src/3rdparty/pybind11/common.h | 560 --
src/3rdparty/pybind11/complex.h | 47 -
src/3rdparty/pybind11/descr.h | 177 -
src/3rdparty/pybind11/eigen.h | 239 -
src/3rdparty/pybind11/eval.h | 105 -
src/3rdparty/pybind11/functional.h | 79 -
src/3rdparty/pybind11/numpy.h | 1169 ---
src/3rdparty/pybind11/operators.h | 154 -
src/3rdparty/pybind11/options.h | 65 -
src/3rdparty/pybind11/pybind11.h | 1730 -----
src/3rdparty/pybind11/pytypes.h | 899 ---
src/3rdparty/pybind11/stl.h | 256 -
src/3rdparty/pybind11/stl_bind.h | 541 --
src/3rdparty/pybind11/typeid.h | 53 -
src/3rdparty/tachyon/unix/Makefile.msvc | 7686 ++++++++++----------
src/core/resources/core.qrc | 22 +-
src/core/utilities/BoundedPriorityQueue.h | 266 +-
src/core/utilities/DeferredMethodInvocation.h | 168 +-
src/core/utilities/MemoryPool.h | 254 +-
src/core/utilities/io/gzdevice/qtiocompressor.cpp | 1332 ++--
src/core/utilities/io/gzdevice/qtiocompressor.h | 196 +-
src/core/utilities/mesh/HalfEdgeMesh.h | 1350 ++--
src/gui/resources/gui.qrc | 230 +-
src/opengl_renderer/resources/glsl/arrows/flat.fs | 72 +-
src/opengl_renderer/resources/glsl/arrows/flat.gs | 116 +-
src/opengl_renderer/resources/glsl/arrows/flat.vs | 92 +-
.../resources/glsl/arrows/flat_tri.vs | 128 +-
.../resources/glsl/arrows/picking/flat.fs | 72 +-
.../resources/glsl/arrows/picking/flat.vs | 116 +-
.../resources/glsl/arrows/picking/flat_tri.vs | 170 +-
.../resources/glsl/arrows/picking/shaded.fs | 72 +-
.../resources/glsl/arrows/picking/shaded.vs | 126 +-
.../resources/glsl/arrows/shaded.fs | 92 +-
.../resources/glsl/arrows/shaded.vs | 110 +-
.../resources/glsl/cylinder/cylinder_raytraced.fs | 310 +-
.../resources/glsl/cylinder/cylinder_raytraced.gs | 332 +-
.../resources/glsl/cylinder/cylinder_raytraced.vs | 128 +-
.../glsl/cylinder/cylinder_raytraced_tri.vs | 156 +-
.../resources/glsl/cylinder/flat.gs | 134 +-
.../glsl/cylinder/picking/cylinder_raytraced.fs | 276 +-
.../glsl/cylinder/picking/cylinder_raytraced.gs | 330 +-
.../glsl/cylinder/picking/cylinder_raytraced.vs | 150 +-
.../cylinder/picking/cylinder_raytraced_tri.vs | 184 +-
.../resources/glsl/cylinder/picking/flat.gs | 134 +-
src/opengl_renderer/resources/glsl/image/image.fs | 80 +-
src/opengl_renderer/resources/glsl/image/image.vs | 84 +-
src/opengl_renderer/resources/glsl/lines/line.fs | 74 +-
src/opengl_renderer/resources/glsl/lines/line.vs | 82 +-
.../resources/glsl/lines/picking/line.fs | 74 +-
.../resources/glsl/lines/picking/line.vs | 120 +-
.../resources/glsl/lines/picking/thick_line.vs | 160 +-
.../resources/glsl/lines/thick_line.vs | 136 +-
.../resources/glsl/markers/marker.fs | 74 +-
.../resources/glsl/markers/marker.vs | 82 +-
.../resources/glsl/markers/picking/marker.fs | 74 +-
.../resources/glsl/markers/picking/marker.vs | 120 +-
src/opengl_renderer/resources/glsl/mesh/mesh.fs | 94 +-
src/opengl_renderer/resources/glsl/mesh/mesh.vs | 98 +-
.../resources/glsl/mesh/picking/mesh.fs | 74 +-
.../resources/glsl/mesh/picking/mesh.vs | 124 +-
.../resources/glsl/particles/geometry/box/box.gs | 584 +-
.../resources/glsl/particles/geometry/box/box.vs | 110 +-
.../glsl/particles/geometry/box/box_tristrip.vs | 222 +-
.../glsl/particles/geometry/box/picking/box.gs | 504 +-
.../glsl/particles/geometry/box/picking/box.vs | 124 +-
.../particles/geometry/box/picking/box_tristrip.vs | 224 +-
.../resources/glsl/particles/geometry/cube/cube.fs | 128 +-
.../resources/glsl/particles/geometry/cube/cube.gs | 546 +-
.../resources/glsl/particles/geometry/cube/cube.vs | 96 +-
.../glsl/particles/geometry/cube/cube_tristrip.vs | 154 +-
.../glsl/particles/geometry/cube/picking/cube.fs | 66 +-
.../glsl/particles/geometry/cube/picking/cube.gs | 460 +-
.../glsl/particles/geometry/cube/picking/cube.vs | 110 +-
.../geometry/cube/picking/cube_tristrip.vs | 156 +-
.../glsl/particles/geometry/ellipsoid/ellipsoid.fs | 310 +-
.../glsl/particles/geometry/ellipsoid/ellipsoid.gs | 678 +-
.../glsl/particles/geometry/ellipsoid/ellipsoid.vs | 104 +-
.../geometry/ellipsoid/ellipsoid_tristrip.vs | 248 +-
.../geometry/ellipsoid/picking/ellipsoid.fs | 292 +-
.../geometry/ellipsoid/picking/ellipsoid.gs | 678 +-
.../geometry/ellipsoid/picking/ellipsoid.vs | 120 +-
.../ellipsoid/picking/ellipsoid_tristrip.vs | 264 +-
.../particles/geometry/sphere/picking/sphere.fs | 178 +-
.../particles/geometry/sphere/picking/sphere.gs | 620 +-
.../particles/geometry/sphere/picking/sphere.vs | 110 +-
.../geometry/sphere/picking/sphere_tristrip.vs | 178 +-
.../glsl/particles/geometry/sphere/sphere.fs | 198 +-
.../glsl/particles/geometry/sphere/sphere.gs | 618 +-
.../glsl/particles/geometry/sphere/sphere.vs | 96 +-
.../particles/geometry/sphere/sphere_tristrip.vs | 144 +-
.../glsl/particles/imposter/sphere/flat_shading.fs | 82 +-
.../imposter/sphere/picking/flat_shading.fs | 82 +-
.../imposter/sphere/picking/with_depth.fs | 118 +-
.../imposter/sphere/picking/with_depth.gs | 142 +-
.../imposter/sphere/picking/with_depth.vs | 110 +-
.../imposter/sphere/picking/with_depth_tri.vs | 200 +-
.../imposter/sphere/picking/without_depth.gs | 120 +-
.../imposter/sphere/picking/without_depth.vs | 104 +-
.../imposter/sphere/picking/without_depth_tri.vs | 174 +-
.../glsl/particles/imposter/sphere/with_depth.fs | 130 +-
.../glsl/particles/imposter/sphere/with_depth.gs | 142 +-
.../glsl/particles/imposter/sphere/with_depth.vs | 96 +-
.../particles/imposter/sphere/with_depth_tri.vs | 178 +-
.../particles/imposter/sphere/without_depth.fs | 96 +-
.../particles/imposter/sphere/without_depth.gs | 120 +-
.../particles/imposter/sphere/without_depth.vs | 90 +-
.../particles/imposter/sphere/without_depth_tri.vs | 144 +-
.../particles/pointsprites/sphere/flat_shading.fs | 86 +-
.../pointsprites/sphere/picking/flat_shading.fs | 86 +-
.../pointsprites/sphere/picking/with_depth.fs | 124 +-
.../pointsprites/sphere/picking/with_depth.vs | 182 +-
.../pointsprites/sphere/picking/without_depth.vs | 156 +-
.../particles/pointsprites/sphere/with_depth.fs | 134 +-
.../particles/pointsprites/sphere/with_depth.vs | 158 +-
.../particles/pointsprites/sphere/without_depth.fs | 100 +-
.../particles/pointsprites/sphere/without_depth.vs | 122 +-
.../particles/pointsprites/square/flat_shading.fs | 74 +-
.../pointsprites/square/picking/flat_shading.fs | 74 +-
src/opengl_renderer/resources/glsl/text/text.fs | 80 +-
src/opengl_renderer/resources/glsl/text/text.vs | 84 +-
src/opengl_renderer/resources/resources.qrc | 230 +-
src/plugins/crystalanalysis/data/Cluster.h | 482 +-
src/plugins/crystalanalysis/data/ClusterGraph.cpp | 572 +-
src/plugins/crystalanalysis/data/ClusterGraph.h | 206 +-
src/plugins/crystalanalysis/data/ClusterVector.h | 226 +-
.../crystalanalysis/data/DislocationNetwork.cpp | 246 +-
.../crystalanalysis/data/DislocationNetwork.h | 598 +-
src/plugins/crystalanalysis/data/PlanarDefects.cpp | 60 +-
src/plugins/crystalanalysis/data/PlanarDefects.h | 120 +-
.../crystalanalysis/modifier/dxa/BurgersCircuit.h | 300 +-
.../modifier/dxa/CrystalPathFinder.cpp | 308 +-
.../modifier/dxa/CrystalPathFinder.h | 216 +-
.../modifier/dxa/DislocationTracer.cpp | 2610 +++----
.../modifier/dxa/DislocationTracer.h | 310 +-
.../modifier/dxa/ElasticMapping.cpp | 780 +-
.../crystalanalysis/modifier/dxa/ElasticMapping.h | 392 +-
.../crystalanalysis/modifier/dxa/InterfaceMesh.cpp | 522 +-
.../crystalanalysis/modifier/dxa/InterfaceMesh.h | 254 +-
.../modifier/dxa/PlanarDefectIdentification.cpp | 752 +-
.../modifier/dxa/PlanarDefectIdentification.h | 162 +-
.../crystalanalysis/util/DelaunayTessellation.cpp | 494 +-
.../crystalanalysis/util/DelaunayTessellation.h | 474 +-
.../util/ManifoldConstructionHelper.h | 836 +--
.../particles/gui/resources/particles_gui.qrc | 40 +-
.../particles/gui/util/BondPropertyComboBox.cpp | 178 +-
.../gui/util/ParticlePropertyComboBox.cpp | 178 +-
.../particles/util/NearestNeighborFinder.cpp | 436 +-
src/plugins/particles/util/NearestNeighborFinder.h | 652 +-
.../pyscript/gui/resources/pyscript_gui.qrc | 28 +-
tests/files/LAMMPS/animation.windows_encoding.dump | 902 +--
tests/files/VTK/ThomsonTet_Gr1_rotmat1set.vtk | 52 +-
.../ThomsonTet_Gr1_rotmatNonRand_unstructGrid.vtk | 50 +-
157 files changed, 20964 insertions(+), 29175 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ovito.git
More information about the debian-science-commits
mailing list