Merge pull request #1078 from mcneel/1.19

1.19
mcneel · Feb 27, 2024 · 7af5249 · 7af5249
2 parents 9a2afd6 + 2f1c4b9
commit 7af5249
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/RhinoInside.Revit.External/DB/CompoundElementFilter.cs b/src/RhinoInside.Revit.External/DB/CompoundElementFilter.cs
@@ -120,6 +120,7 @@ public static ElementFilter ElementClassFilter(Type type)
       else if (typeof(Mullion) == type)                     return new ElementClassFilter(typeof(FamilyInstance)).Intersect(new ElementCategoryFilter(BuiltInCategory.OST_CurtainWallMullions));
       else if (typeof(Panel) == type)                       return new ElementClassFilter(typeof(FamilyInstance)).Intersect(new ElementCategoryFilter(BuiltInCategory.OST_CurtainWallPanels));
       else if (typeof(CurveElement).IsAssignableFrom(type)) return new ElementClassFilter(typeof(CurveElement));
+      else if (typeof(CombinableElement) == type)           return new ElementMulticlassFilter(new Type[] {typeof(GenericForm), typeof(GeomCombination) });
       else if (typeof(ElementType) == type)                 return new ElementIsElementTypeFilter();
       else if (typeof(Element) != type)                     return new ElementClassFilter(type);
 

diff --git a/src/RhinoInside.Revit.GH/Components/Element/Geometry.cs b/src/RhinoInside.Revit.GH/Components/Element/Geometry.cs
@@ -56,8 +56,8 @@ internal static IGH_GeometricGoo ToGeometricGoo(GeometryBase geometry)
 
     static readonly ARDB.ElementFilter ElementHasGeometryFilter = CompoundElementFilter.Intersect
     (
-      // Not 100% sure but looks like only elements with category have geometry.
-      CompoundElementFilter.ElementHasCategoryFilter,
+      // Not 100% sure but looks like only elements with category or `CombinableElement` have geometry.
+      CompoundElementFilter.ElementHasCategoryFilter.Union(CompoundElementFilter.ElementClassFilter(typeof(ARDB.CombinableElement))),
       CompoundElementFilter.ElementHasBoundingBoxFilter.Union(CompoundElementFilter.ElementClassFilter(typeof(ARDB.FamilySymbol))),
       // Types below return no geometry.
       new ARDB.ElementMulticlassFilter
@@ -227,8 +227,12 @@ List<GeometryBase> list
             ToGeometryBaseMany
             (
               x =>
-              options.View is null ||
-              !options.View.GetCategoryHidden(GeometryDecoder.Context.Peek.Category.Id)
+              {
+                if (options.View is null) return true;
+                if (GeometryDecoder.Context.Peek.Category is null) return true;
+                if (!options.View.GetCategoryHidden(GeometryDecoder.Context.Peek.Category?.Id ?? element.Category.Id)) return true;
+                return false;
+              }
             ).
             Where(x => !x.IsNullOrEmpty())
           );