Commit edade359 authored by schultezub's avatar schultezub
Browse files

fixed improper/redundant transfer function deinitialization

git-svn-id: https://camplinux.in.tum.de/svn/campvis/trunk@510 bb408c1c-ae56-11e1-83d9-df6b3e0c105e
parent ccbcd00e
......@@ -133,8 +133,8 @@ namespace campvis {
_fbo->activate();
_fbo->detachAll();
_fbo->deactivate();
LGL_ERROR;
delete _fbo;
_fbo = 0;
}
AbstractTransferFunction::deinit();
......
......@@ -62,8 +62,10 @@ namespace campvis {
tgtAssert(tf != 0, "Transfer function must not be 0.");
s_BeforeTFReplace(_transferFunction);
if (_transferFunction != 0)
if (_transferFunction != 0) {
_transferFunction->s_changed.disconnect(this);
_transferFunction->deinit();
}
delete _transferFunction;
......
......@@ -93,6 +93,11 @@ namespace campvis {
_pgGenerator.deinit();
_eepGenerator.deinit();
_raycaster.deinit();
removeProperty(&_raycaster.p_transferFunction);
removeProperty(&_raycaster.p_samplingRate);
removeProperty(_raycaster.getProperty("CentralDifferences"));
VisualizationProcessor::deinit();
}
......
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