Merge branch 'columbia-fixes' into 'development'
Columbia fixes See merge request !96
Showing
... | ... | @@ -22,8 +22,8 @@ |
// | ||
// ================================================================================================ | ||
#ifndef INDEXEDIndexedMeshGeometry_H__ | ||
#define INDEXEDIndexedMeshGeometry_H__ | ||
#ifndef INDEXEDMESHGEOMETRY_H__ | ||
#define INDEXEDMESHGEOMETRY_H__ | ||
#include "tgt/bounds.h" | ||
#include "tgt/vector.h" | ||
... | ... | @@ -79,6 +79,20 @@ namespace campvis { |
*/ | ||
IndexedMeshGeometry& operator=(const IndexedMeshGeometry& rhs); | ||
/** | ||
* The list of picking information colors, may be empty. | ||
* \return _pickingInformation | ||
*/ | ||
const std::vector<tgt::col4>& getPickingInformation() const; | ||
/** | ||
< |