Merge branch 'master' of https://github.com/urho3d/Urho3D

Bin/Data/Urho2D/isometric_grass_and_water.tmx

@@ -2,7 +2,7 @@
 <map version="1.0" orientation="isometric" width="25" height="25" tilewidth="64" tileheight="32">
  <tileset firstgid="1" name="isometric_grass_and_water" tilewidth="64" tileheight="64">
   <tileoffset x="0" y="16"/>
-  <image source="isometric_grass_and_water.png" width="256" height="384"/>
+  <image source="isometric_grass_and_water.png" width="256" height="512"/>
   <terraintypes>
    <terrain name="Grass" tile="0"/>
    <terrain name="Water" tile="22"/>

Source/Engine/Graphics/Model.h

@@ -208,7 +208,7 @@ private:
     /// Index buffer data for asynchronous loading.
     Vector<IndexBufferDesc> loadIBData_;
     /// Geometry definitions for asynchronous loading.
-    Vector<Vector<GeometryDesc> > loadGeometries_;
+    Vector<PODVector<GeometryDesc> > loadGeometries_;
 };
 
 }

Source/Engine/UI/UI.cpp

@@ -1023,10 +1023,11 @@ void UI::ProcessClickBegin(const IntVector2& cursorPos, int button, int buttons,
                 dragBeginTimer_.Reset();
             }
         }
-        else if (!HasModalElement())
+        else
         {
-            // If clicked over no element, or a disabled element, lose focus
-            SetFocusElement(0);
+            // If clicked over no element, or a disabled element, lose focus (but not if there is a modal element)
+            if (!HasModalElement())
+                SetFocusElement(0);
             SendClickEvent(E_UIMOUSECLICK, element, cursorPos, button, buttons, qualifiers);
         }