Merge pull request #443 from Unity-Technologies/bugfixes/schoen/create-workspace

mtschoen-unity · web-flow · commit 08d5aa37d255 · 2017-12-04T19:55:56.000-05:00
Fix exception when loading Poly workspace in project without Poly Toolkit
diff --git a/Scripts/Modules/WorkspaceModule.cs b/Scripts/Modules/WorkspaceModule.cs
@@ -167,6 +167,9 @@ public void OnDeserializePreferences(object obj)
 
         internal void CreateWorkspace(Type t, Action<IWorkspace> createdCallback = null)
         {
+            if (!typeof(IWorkspace).IsAssignableFrom(t))
+                return;
+
             // HACK: MiniWorldWorkspace is not working in single pass yet
             if (t == typeof(MiniWorldWorkspace) && PlayerSettings.stereoRenderingPath != StereoRenderingPath.MultiPass)
             {

Original file line number	Diff line number	Diff line change
`@@ -167,6 +167,9 @@ public void OnDeserializePreferences(object obj)`
`167`	`167`
`168`	`168`	`internal void CreateWorkspace(Type t, Action<IWorkspace> createdCallback = null)`
`169`	`169`	`{`
	`170`	`+ if (!typeof(IWorkspace).IsAssignableFrom(t))`
	`171`	`+ return;`
	`172`	`+`
`170`	`173`	`// HACK: MiniWorldWorkspace is not working in single pass yet`
`171`	`174`	`if (t == typeof(MiniWorldWorkspace) && PlayerSettings.stereoRenderingPath != StereoRenderingPath.MultiPass)`
`172`	`175`	`{`