#4388 AppFwk : Always mark field as used when editor is created

Fwk/AppFwk/cafUserInterface/cafPdmUiFormLayoutObjectEditor.cpp

@@ -183,9 +183,6 @@ int caf::PdmUiFormLayoutObjectEditor::recursivelyConfigureAndUpdateUiOrderingInG
 
                 if (fieldEditor)
                 {
-                    // Mark this field as used in the editor
-                    m_usedFields.insert(field->fieldHandle());
-
                     // Also assign required item space that isn't taken up by field and label
                     spareColumnsToAssign += minimumItemColumnSpan - (minimumLabelColumnSpan + minimumFieldColumnSpan);
 
@@ -420,6 +417,11 @@ caf::PdmUiFieldEditorHandle* caf::PdmUiFormLayoutObjectEditor::findOrCreateField
         fieldEditor = it->second;
     }
 
+    if (fieldEditor)
+    {
+        m_usedFields.insert(field->fieldHandle());
+    }
+
     return fieldEditor;
 }