Currently job artifacts in CI/CD pipelines on LRZ GitLab never expire. Starting from Wed 26.1.2022 the default expiration time will be 30 days (GitLab default). Currently existing 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 1f8a8832 authored by CAMP C++ Builder's avatar CAMP C++ Builder
Browse files

merge conflict resolution

parent 9defc3a0
......@@ -37,6 +37,7 @@
#include "application/campvispainter.h"
#include "application/gui/properties/propertywidgetfactory.h"
#include "application/gui/mainwindow.h"
#include "application/gui/mdi/mdidockablewindow.h"
#include "core/tools/job.h"
#include "core/tools/opengljobprocessor.h"
......@@ -261,9 +262,7 @@ namespace campvis {
PipelineRecord pr = { pipeline, painter };
_pipelines.push_back(pr);
if (!hide) {
_pipelineWindows[pipeline] = _mainWindow->addVisualizationPipelineWidget(name, canvas);
}
_pipelineWindows[pipeline] = _mainWindow->addVisualizationPipelineWidget(name, canvas);
// initialize context (GLEW) and pipeline in OpenGL thread)
GLJobProc.enqueueJob(
......
......@@ -35,6 +35,7 @@
#include "core/datastructures/datacontainer.h"
#ifdef CAMPVIS_HAS_SCRIPTING
#include "scripting/glue/luavmstate.h"
#endif
......@@ -49,6 +50,7 @@ namespace campvis {
class AbstractPipeline;
class MainWindow;
class CampVisPainter;
class MdiDockableWindow;
class LuaVmState;
/**
......
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