Merge branch 'development' into cmake/SPEC-7484

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> # Conflicts: # Code/Editor/ResourceSelectorHost.cpp
2021-08-11 07:55:26 -07:00
parent d71674579a a26d6d5ec9
commit 9f7d280a1e
77 changed files with 248 additions and 1003 deletions
@@ -75,11 +75,7 @@ public:

    void SetGlobalSelection(const char* resourceType, const char* value) override
    {
-        if (!resourceType)
-        {
-            return;
-        }
-        if (!value)
+        if (!resourceType || !value)
        {
            return;
        }