Diffusion MITK 9ce5e8ce492e

Merge branch 'bug-9724-enableShadingFBMapper2D'
9ce5e8ce492e
Actions

Description

Merge branch 'bug-9724-enableShadingFBMapper2D'

Conflicts:
Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper2D.cpp

Details

Provenance

reicht

Authored on Oct 12 2011, 10:09 PM

Parents

rMITK583f61834e03: shader architecture added
rMITK1220febdef22: Merge branch 'bug-9601-2DFiberMapping'

Branches

Unknown

Tags

Unknown

Event Timeline

reicht committed rMITK9ce5e8ce492e: Merge branch 'bug-9724-enableShadingFBMapper2D' (authored by reicht).Oct 12 2011, 10:09 PM

Merged Changes

583f61834e03 shader architecture added
Author
reicht
Browse Repository
No Builds
No Audits

Changes (4)

Path

Size

Modules/

DiffusionImaging/

IODataStructures/

mitkDiffusionImagingObjectFactory.cpp

Rendering/

mitkFiberBundleMapper2D.cpp

mitkFiberBundleMapper2D.h

	Modules/	DiffusionImaging/	Rendering/
	Core/	Code/	Rendering/

	mitkShaderFiberClipping.xml
	mitkShaderLighting.xml

rMITK9ce5e8ce492e

View Options

Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper2D.cpp

View Options

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper2D.h

View Options

Modules/DiffusionImaging/Rendering/mitkShaderFiberClipping.xml

Merge branch 'bug-9724-enableShadingFBMapper2D'9ce5e8ce492eActions

Description

Details

Event Timeline

Merged Changes

Changes (4)

rMITK9ce5e8ce492e

Modules/DiffusionImaging/IODataStructures/mitkDiffusionImagingObjectFactory.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper2D.cpp

Modules/DiffusionImaging/Rendering/mitkFiberBundleMapper2D.h

Modules/DiffusionImaging/Rendering/mitkShaderFiberClipping.xml

Merge branch 'bug-9724-enableShadingFBMapper2D'
9ce5e8ce492e
Actions