Merge branch 'develop' of https://github.com/vvvv/vvvv into develop

vvvv · Jun 15, 2017 · c9c9ed6 · c9c9ed6
2 parents 706d543 + b601655
commit c9c9ed6
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/vvvv45/src/nodes/plugins/Layer/DrawText/DrawText.cs b/vvvv45/src/nodes/plugins/Layer/DrawText/DrawText.cs
@@ -153,6 +153,12 @@ public void Evaluate(int spreadMax)
  foreach (var kv in FFonts)
  kv.Value.Tag = null;
 
+ if (e != null)
+ {
+ var e_ = e; 
+ e = null;
+ throw e_;
+ }
  }
  #endregion mainloop
 
@@ -374,12 +380,15 @@ public void Render(IDXLayerIO ForPin, Device OnDevice)
  catch (Exception e)
  {
  Logger.Log(e);
+ this.e = e;
  }
  finally
  {
  dh.Sprite.End();
  }
  }
- #endregion
+ #endregion
+
+ Exception e;
  }
 }
diff --git a/vvvv45/vvvv.exe.config b/vvvv45/vvvv.exe.config
@@ -30,6 +30,28 @@
  <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
  <bindingRedirect oldVersion="0.0.0.0-4.4.0.0" newVersion="4.4.0.0" />
  </dependentAssembly>
+
+ <dependentAssembly>
+ <assemblyIdentity name="SharpDX" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.1.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="SharpDX.Mathematics" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.1.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="SharpDX.DXGI" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.1.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="SharpDX.Direct2D1" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.1.0" />
+ </dependentAssembly>
+ <dependentAssembly>
+ <assemblyIdentity name="SharpDX.RawInput" publicKeyToken="b4dcf0f35e5521f1" culture="neutral" />
+ <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.1.0" />
+ </dependentAssembly>
+
  </assemblyBinding>
  </runtime>
 </configuration>