Merge branch 'master' into release

src/Drawie

@@ -1 +1 @@
-Subproject commit f165926f94cc08ab774fd1f86de75d90a95ea146
+Subproject commit 6844357c31e686ad30f255a4bfab93b37e5bfde8

src/PixiEditor/Properties/AssemblyInfo.cs

@@ -43,5 +43,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.1.4")]
-[assembly: AssemblyFileVersion("2.0.1.4")]
+[assembly: AssemblyVersion("2.0.1.5")]
+[assembly: AssemblyFileVersion("2.0.1.5")]

src/PixiEditor/Views/Rendering/Scene.cs

@@ -705,7 +705,17 @@ internal class Scene : Zoombox.Zoombox, ICustomHitTest
         }
 
         var size = new PixelSize((int)Bounds.Width, (int)Bounds.Height);
-        RenderFrame(size);
+        try
+        {
+            RenderFrame(size);
+            info = string.Empty;
+        }
+        catch (Exception e)
+        {
+            info = new LocalizedString("ERROR_GPU_RESOURCES_CREATION", e.Message);
+            CrashHelper.SendExceptionInfo(e);
+            return;
+        }
     }
 
     public void QueueNextFrame()