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

Minor fix to amend cherry-picking screwups

parent 99a6b979
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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)
+1 −0
Original line number Diff line number Diff line
@@ -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: