Commit f872738d authored by Ken Martin's avatar Ken Martin Committed by Code Review

Merge topic 'fix_text_mapper_and_regressions' into master

cc429a57 Fix a regression and new failing test
parents e58d7d7d cc429a57
......@@ -216,6 +216,10 @@ int vtkTextActor3D::UpdateImageActor()
return 1;
}
// copy information to the delegate
vtkInformation *info = this->GetPropertyKeys();
this->ImageActor->SetPropertyKeys(info);
// Do we need to (re-)render the text ?
// Yes if:
// - instance has been modified since last build
......
......@@ -1547,13 +1547,14 @@ int vtkOpenGLRenderWindow::CreateHardwareOffScreenWindow(int width, int height)
assert("pre: not_initialized" && !this->OffScreenUseFrameBuffer);
// This implementation currently ignores multisampling configurations:
if (this->MultiSamples > 1)
{
vtkDebugMacro(<<"Multisampling is not currently supported by the "
"accelerated offscreen rendering backend. Falling back to "
"a platform-specific offscreen solution...");
return 0;
}
// the following code causes tests to fail, commenting it out
// if (this->MultiSamples > 1)
// {
// vtkDebugMacro(<<"Multisampling is not currently supported by the "
// "accelerated offscreen rendering backend. Falling back to "
// "a platform-specific offscreen solution...");
// return 0;
// }
// 1. create a regular OpenGLcontext (ie create a window)
this->CreateAWindow();
......
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