Caf: Made groups become hidden if requested in the uiOrdering system

p4#: 21175

cafUserInterface/cafPdmUiDefaultObjectEditor.cpp

@@ -153,6 +153,8 @@ void PdmUiDefaultObjectEditor::recursiveSetupFieldsAndGroups(const std::vector<P
     int currentRowIndex = 0;
     for (size_t i = 0; i < uiItems.size(); ++i)
     {
+        if (uiItems[i]->isUiHidden(uiConfigName)) continue;
+
         if (uiItems[i]->isUiGroup())
         {
             PdmUiGroup* group = static_cast<PdmUiGroup*>(uiItems[i]);
@@ -197,9 +199,6 @@ void PdmUiDefaultObjectEditor::recursiveSetupFieldsAndGroups(const std::vector<P
             PdmFieldHandle* field = dynamic_cast<PdmFieldHandle*>(uiItems[i]);
             PdmUiFieldEditorHandle* fieldEditor = NULL;
 
-            if (!field->isUiHidden(uiConfigName))
-            {
-
             // Find or create FieldEditor
             std::map<QString, PdmUiFieldEditorHandle*>::iterator it;
             it = m_fieldViews.find(field->keyword());
@@ -303,7 +302,7 @@ void PdmUiDefaultObjectEditor::recursiveSetupFieldsAndGroups(const std::vector<P
 
                 currentRowIndex++;
             }
-            }
+
         }
     }
 }