Commit c94345fc authored by David E. DeMarle's avatar David E. DeMarle Committed by Kitware Robot

Merge topic 'ospray-fixes'

5a9d921d Correct the recent NULL replacement for windows compiler.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !3398
parents 12506e9e 5a9d921d
......@@ -98,7 +98,7 @@ int TestOSPRayCompositePolyDataMapper2(int argc, char* argv[])
cyl->Update();
child->DeepCopy(cyl->GetOutput(0));
blocks[parent]->SetBlock(
block, (block % 2) ? nullptr : child);
block, (block % 2) ? nullptr : child.GetPointer());
blocks[parent]->GetMetaData(block)->Set(
vtkCompositeDataSet::NAME(), blockName.c_str());
// test not setting it on some
......
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