Commit 96d9682d authored by Haocheng LIU's avatar Haocheng LIU Committed by Kitware Robot

Merge topic 'update-glyph-blockinfo-when-read-from-smtk-file' into release

fadfa6b5 BUG: Update glyph blockinfo when read from smtk files
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: T.J. Corona's avatarT.J. Corona <tj.corona@kitware.com>
Merge-request: !611
parents a2d4c8ad fadfa6b5
Pipeline #108561 running with stage
......@@ -304,6 +304,7 @@ public:
if (glyphRep)
{
this->ModelInfos[model.entity()].setGlyphRep(glyphRep);
this->ModelInfos[model.entity()].updateBlockInfo(mgr);
glyphRep->setProperty("smtkUUID",
QByteArray((const char*)model.entity().begin(), (int)model.entity().size()));
pqSMAdaptor::setEnumerationProperty(
......
......@@ -169,7 +169,7 @@ void pqSMTKModelInfo::updateBlockInfo(smtk::model::ManagerPtr mgr)
prop.Set(&invis_ids[0], static_cast<unsigned int>(invis_ids.size()));
proxy->UpdateVTKObjects();
}
if (invis_idsGlyph.size() > 1)
if (invis_idsGlyph.size() > 1 && this->GlyphRepresentation)
{
vtkSMProxy* proxyGlyph = this->GlyphRepresentation->getProxy();
vtkSMPropertyHelper propGlyph(proxyGlyph, "BlockVisibility");
......@@ -178,7 +178,7 @@ void pqSMTKModelInfo::updateBlockInfo(smtk::model::ManagerPtr mgr)
propGlyph.Set(&invis_idsGlyph[0], static_cast<unsigned int>(invis_idsGlyph.size()));
proxyGlyph->UpdateVTKObjects();
}
if (invis_idsGlyph.size() > 1)
if (invis_idsGlyph.size() > 1 && this->GlyphRepresentation)
{
vtkSMProxy* proxyGlyph = this->GlyphRepresentation->getProxy();
vtkSMPropertyHelper propGlyph(proxyGlyph, "BlockVisibility");
......
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