Diffusion MITK 9277ab5dd3b9

Merge branch 'bug-13543-viewport-rendering-wo-spaces' into releases/snapshot…
9277ab5dd3b9
Actions

Description

Merge branch 'bug-13543-viewport-rendering-wo-spaces' into releases/snapshot-201212-prepare

Conflicts:
CMakeExternals/MITKData.cmake
Core/Code/Rendering/mitkRenderingTestHelper.cpp
Core/Code/files.cmake

Details

Provenance

maleike

Authored on Dec 6 2012, 7:12 PM

Parents

rMITK52c04d801b1b: Move/Scale OpenGL output to Viewport (as defined by OpenGL AND/OR VTK) Also…
rMITKe78064a94823: Revert "Merge branch 'bug-13543-viewport-rendering' into releases/snapshot…

Branches

Unknown

Tags

Unknown

Event Timeline

maleike committed rMITK9277ab5dd3b9: Merge branch 'bug-13543-viewport-rendering-wo-spaces' into releases/snapshot… (authored by maleike).Dec 6 2012, 7:12 PM

Merged Changes

52c04d801b1b Move/Scale OpenGL output to Viewport (as defined by OpenGL AND/OR VTK) Also…
Author
maleike
Browse Repository
No Builds
No Audits
7fbd7ed1dc94 Add regression test regarding VTK viewport rendering and MITK OpenGL mappers…
Author
maleike
Browse Repository
No Builds
No Audits

Changes (14)

Path

Size

Packages

CMakeExternals/

MITKData.cmake

O1: MITK Reviewer Group I

Core/

Code/

Rendering/

mitkGLMapper2D.h

mitkVtkPropRenderer.cpp

	Rendering/
	Testing/

mitkRenderingTestHelper.cpp

mitkRenderingTestHelper.h

Testing/

files.cmake

mitkRenderingTestHelper.cpp

mitkRenderingTestHelper.h

files.cmake

Documentation/

Doxygen/

Concepts/

QVTKRendering.dox

Modules/

PlanarFigure/

Testing/

CMakeLists.txt

O1: MITK Reviewer Group I

files.cmake

O1: MITK Reviewer Group I

mitkViewportRenderingTest.cpp

O1: MITK Reviewer Group I

	Modules/	PlanarFigure/	Testing/

	mitkViewportRenderingTestscene.h
	COPYRIGHT_HEADER

O1: MITK Reviewer Group I

rMITK9277ab5dd3b9

View Options

CMakeExternals/MITKData.cmake

View Options

Core/Code/Rendering/mitkGLMapper2D.h

View Options

Core/Code/Rendering/mitkRenderingTestHelper.cpp

View Options

Core/Code/Rendering/mitkRenderingTestHelper.h

View Options

Core/Code/Rendering/mitkVtkPropRenderer.cpp

View Options

Core/Code/Testing/files.cmake

View Options

Core/Code/Testing/mitkRenderingTestHelper.cpp

View Options

Core/Code/Testing/mitkRenderingTestHelper.h

View Options

Core/Code/files.cmake

View Options

Core/Documentation/Doxygen/Concepts/QVTKRendering.dox

View Options

Modules/PlanarFigure/Testing/CMakeLists.txt

View Options

Modules/PlanarFigure/Testing/files.cmake

View Options

Modules/PlanarFigure/Testing/mitkViewportRenderingTest.cpp

View Options

Modules/PlanarFigure/Testing/mitkViewportRenderingTestscene.h

Merge branch 'bug-13543-viewport-rendering-wo-spaces' into releases/snapshot…9277ab5dd3b9Actions

Description

Details

Event Timeline

Merged Changes

Changes (14)

rMITK9277ab5dd3b9

CMakeExternals/MITKData.cmake

Core/Code/Rendering/mitkGLMapper2D.h

Core/Code/Rendering/mitkRenderingTestHelper.cpp

Core/Code/Rendering/mitkRenderingTestHelper.h

Core/Code/Rendering/mitkVtkPropRenderer.cpp

Core/Code/Testing/files.cmake

Core/Code/Testing/mitkRenderingTestHelper.cpp

Core/Code/Testing/mitkRenderingTestHelper.h

Core/Code/files.cmake

Core/Documentation/Doxygen/Concepts/QVTKRendering.dox

Modules/PlanarFigure/Testing/CMakeLists.txt

Modules/PlanarFigure/Testing/files.cmake

Modules/PlanarFigure/Testing/mitkViewportRenderingTest.cpp

Modules/PlanarFigure/Testing/mitkViewportRenderingTestscene.h

Merge branch 'bug-13543-viewport-rendering-wo-spaces' into releases/snapshot…
9277ab5dd3b9
Actions