The expiration time for new job artifacts in CI/CD pipelines is now 30 days (GitLab default). Previously generated artifacts in already completed jobs will not be affected by the change. The latest artifacts for all jobs in the latest successful pipelines will be kept. More information: https://gitlab.lrz.de/help/user/admin_area/settings/continuous_integration.html#default-artifacts-expiration

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

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