Minor fix to amend cherry-picking screwups

24cb7144 · Jakob Weiss · 99a6b979 · 24cb7144 · 24cb7144
Commit 24cb7144 authored Sep 29, 2016 by Jakob Weiss
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

visualizationprocessor.cpp core/pipeline/visualizationprocessor.cpp +1 -1

volumeexplorer.h modules/vis/processors/volumeexplorer.h +1 -0

No files found.
--- a/core/pipeline/visualizationprocessor.cpp
+++ b/core/pipeline/visualizationprocessor.cpp
@@ -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)

--- a/modules/vis/processors/volumeexplorer.h
+++ b/modules/vis/processors/volumeexplorer.h
@@ -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: