HomePhabricator
Diffusion MITK 93f4d47ef2e8

Merge branch 'bug-17209-RemoveTimeBoundsFromGeometry3D-V2' into bug-17035…

Description

Merge branch 'bug-17209-RemoveTimeBoundsFromGeometry3D-V2' into bug-17035-BaseGeometry_IntegrationBranch

Conflicts:
Core/Code/DataManagement/mitkBaseData.cpp
Core/Code/DataManagement/mitkDisplayGeometry.cpp
Core/Code/DataManagement/mitkDisplayGeometry.h
Core/Code/DataManagement/mitkGeometry3D.cpp
Core/Code/DataManagement/mitkGeometry3D.h
Core/Code/DataManagement/mitkProportionalTimeGeometry.cpp
Core/Code/DataManagement/mitkSlicedGeometry3D.cpp
Core/Code/DataManagement/mitkSlicedGeometry3D.h
Core/Code/Interactions/mitkCoordinateSupplier.cpp
Core/Code/Rendering/mitkPointSetGLMapper2D.cpp
Core/Code/Rendering/mitkSurfaceGLMapper2D.cpp
Core/Code/Testing/mitkDataStorageTest.cpp
Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilterNew.cpp
Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp
Modules/MapperExt/mitkMeshMapper2D.cpp
Modules/MapperExt/mitkVectorImageMapper2D.cpp
Modules/PlanarFigure/DataManagement/mitkPlanarFigure.cpp
Modules/PlanarFigure/Rendering/mitkPlanarFigureMapper2D.cpp

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.