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
24cb7144
Commit
24cb7144
authored
Sep 29, 2016
by
Jakob Weiss
Browse files
Minor fix to amend cherry-picking screwups
parent
99a6b979
Changes
2
Hide whitespace changes
Inline
Side-by-side
core/pipeline/visualizationprocessor.cpp
View file @
24cb7144
...
...
@@ -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
)
...
...
modules/vis/processors/volumeexplorer.h
View file @
24cb7144
...
...
@@ -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:
...
...
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