Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -191,10 +191,17 @@ namespace AzToolsFramework
                        {
                            if (componentClass->m_editData->m_name == componentTypeNames[i])
                            {
+                                // Although it is rare, it can happen that two (or more) components can have the same name.
+                                // We should only count the first occurrence, so that none of the names in componentTypeNames
+                                // get skipped, but whichever component type that is encountered last will be the one
+                                // that is captured in order to preserve the pre-existing behavior.
+                                if (foundTypeIds[i].IsNull())
+                                {
+                                    ++counter;
+                                }
+
                                foundTypeIds[i] = componentClass->m_typeId;
-                                ++counter;
-                                //Although it is rare, it can happen that two components can have the same name.
-                                //We will capture only the first occurrence.
+
                                return true;
                            }
                        }