HomePhabricator
Diffusion MITK 5fc592846897

Merge remote-tracking branch 'origin/bug-17035-BaseGeometry_V2' into bug…

Description

Merge remote-tracking branch 'origin/bug-17035-BaseGeometry_V2' into bug-17035-BaseGeometry_IntegrationBranch

Conflicts:
Core/Code/Algorithms/mitkSurfaceToImageFilter.cpp
Core/Code/DataManagement/mitkAbstractTransformGeometry.h
Core/Code/DataManagement/mitkGeometry2D.h
Core/Code/DataManagement/mitkGeometry3D.cpp
Core/Code/DataManagement/mitkGeometry3D.h
Core/Code/DataManagement/mitkPlaneGeometry.h
Core/Code/Rendering/mitkBaseRenderer.h
Core/Code/Rendering/mitkPolyDataGLMapper2D.cpp
Core/Code/Testing/files.cmake
Modules/ImageStatistics/mitkImageStatisticsCalculator.cpp
Modules/QtWidgetsExt/QmitkHistogramJSWidget.cpp
Modules/QtWidgetsExt/QmitkSliceWidget.cpp
Modules/Segmentation/Algorithms/mitkContourUtils.cpp
Modules/Segmentation/Algorithms/mitkContourUtils.h

Merged Changes