Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CAMP
campvis-public
Commits
1f8a8832
Commit
1f8a8832
authored
Sep 30, 2014
by
Jakob Weiss
Browse files
merge conflict resolution
parent
9defc3a0
Changes
2
Hide whitespace changes
Inline
Side-by-side
application/campvisapplication.cpp
View file @
1f8a8832
...
...
@@ -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
(
...
...
application/campvisapplication.h
View file @
1f8a8832
...
...
@@ -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
;
/**
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment