Notice: If you are member of any public project or group, please make sure that your GitLab username is not the same as the LRZ identifier/Kennung (see https://gitlab.lrz.de/profile/account). Please change your username if necessary. For more information see the section "Public projects / Öffentliche Projekte" at https://doku.lrz.de/display/PUBLIC/GitLab . Thank you!

Commit 24cb7144 authored by Jakob Weiss's avatar Jakob Weiss

Minor fix to amend cherry-picking screwups

parent 99a6b979
......@@ -81,7 +81,7 @@ namespace campvis {
// Check the render data if we can reuse a texture
cgt::Texture* tex = nullptr;
if (renderData) {`
if (renderData) {
// check if we can get a GL representation of the desired texture
ImageRepresentationGL* glRep;
if (attachment == GL_DEPTH_ATTACHMENT)
......
......@@ -115,6 +115,7 @@ namespace campvis {
MetaProperty p_seProperties; ///< MetaProperty for SliceExtractor properties
MetaProperty p_vrProperties; ///< MetaProperty for Raycaster properties
MetaProperty p_tcpProperties; ///< MetaProperty for TrackballCamera properties
protected:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment