From c0844a2a4c75d2b40c4c8125dd4f378e95fff162 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Thu, 12 Oct 2017 12:16:09 -0700 Subject: [PATCH] Use new AggContext.Init call to specify config --- Program.cs | 2 ++ Submodules/agg-sharp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Program.cs b/Program.cs index 2a597b183..a1ceafadd 100644 --- a/Program.cs +++ b/Program.cs @@ -24,6 +24,8 @@ namespace MatterHackers.MatterControl CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture; Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; + AggContext.Init(embeddedResourceName: "config.json"); + // Make sure we have the right working directory as we assume everything relative to the executable. Directory.SetCurrentDirectory(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly().Location)); diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index c105ee03e..e9ce386b8 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit c105ee03e8b8e7ccf7d847726e6f6a2bb17db6d1 +Subproject commit e9ce386b82430f654462c8c0f22ee4fb1774003c