Commit e543e877 authored by Stan Hammon's avatar Stan Hammon Committed by Kitware Robot
Browse files

Merge topic 'attributeview-bug-fix'

fbb923f7

 Fixed a minor bug in the ComponentAttributeView

Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: buildbot's avatarbuildbot <buildbot@kitware.com>
Acked-by: Bob Obara's avatarBob Obara <bob.obara@kitware.com>
Merge-request: !2716
parents 1923b0ac fbb923f7
...@@ -148,6 +148,8 @@ public: ...@@ -148,6 +148,8 @@ public:
return this->AllDefs; return this->AllDefs;
} }
QList<smtk::attribute::DefinitionPtr> defs;
if (attResource->activeCategories().size() == 1) if (attResource->activeCategories().size() == 1)
{ {
std::string theCategory = *(attResource->activeCategories().begin()); std::string theCategory = *(attResource->activeCategories().begin());
...@@ -155,9 +157,9 @@ public: ...@@ -155,9 +157,9 @@ public:
{ {
return this->AttDefMap[theCategory.c_str()]; return this->AttDefMap[theCategory.c_str()];
} }
return this->AllDefs; return defs; // return an empty list
} }
QList<smtk::attribute::DefinitionPtr> defs;
foreach (DefinitionPtr attDef, this->AllDefs) foreach (DefinitionPtr attDef, this->AllDefs)
{ {
if (attResource->passActiveCategoryCheck(attDef->categories())) if (attResource->passActiveCategoryCheck(attDef->categories()))
......
Supports Markdown
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