Merge pull request #1396 from Azaezel/alpha41/goFilterFish

game mode filterfix

Engine/source/T3D/SubScene.cpp

@@ -348,7 +348,7 @@ void SubScene::load()
       return;
 
    GameMode::findGameModes(mGameModesNames, &mGameModesList);
-   if ((String(mGameModesNames).isNotEmpty() && mGameModesList.size() == 0) || !evaluateCondition())
+   if (!isSelected() && (String(mGameModesNames).isNotEmpty() && mGameModesList.size() == 0) || !evaluateCondition())
    {
       mLoaded = false;
       return;

Engine/source/T3D/gameMode.cpp

@@ -101,7 +101,8 @@ void GameMode::findGameModes(const char* gameModeList, Vector<GameMode*> *outGam
       GameMode* gm;
       if (Sim::findObject(gameModeNames[i].c_str(), gm))
       {
-         outGameModes->push_back(gm);
+         if (gm->isActive() || gm->isAlwaysActive())
+            outGameModes->push_back(gm);
       }
    }
 }