Merge pull request #1135 from mcneel/1.22

Removed `ModelRenderMaterial.Unset` reference.
mcneel · Jul 2, 2024 · dece6aa · dece6aa
2 parents b7c7b36 + 81321a8
commit dece6aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/RhinoInside.Revit.GH/Types/ObjectStyles/Category.cs b/src/RhinoInside.Revit.GH/Types/ObjectStyles/Category.cs
@@ -503,7 +503,7 @@ internal ModelContent ToModelContent(IDictionary<ARDB.ElementId, ModelContent> i
 
         // Material
         {
-          attributes.Material = Material?.ToModelContent(idMap) as ModelRenderMaterial ?? ModelRenderMaterial.Unset;
+          attributes.Material = Material?.ToModelContent(idMap) as ModelRenderMaterial;
         }
 
         // Some hardcoded tweaks…

diff --git a/src/RhinoInside.Revit/Rhinoceros.cs b/src/RhinoInside.Revit/Rhinoceros.cs
@@ -40,6 +40,10 @@ internal static bool InitEto(Assembly assembly)
       if (Eto.Forms.Application.Instance is null)
         new Eto.Forms.Application(Eto.Platforms.Wpf).Attach();
 
+#if RHINO_8
+      Eto.Wpf.Forms.Controls.TextBoxHandler.EnableNoGCRegionDefault = false;
+#endif
+
       return true;
     }
 
@@ -244,7 +248,7 @@ internal static bool Run()
 
       return active;
     }
-    #endregion
+#endregion
 
     #region Guests
     class GuestInfo