diff --git a/MatterControlLib/ApplicationView/SceneOperations.cs b/MatterControlLib/ApplicationView/SceneOperations.cs index c082bc87b..721492179 100644 --- a/MatterControlLib/ApplicationView/SceneOperations.cs +++ b/MatterControlLib/ApplicationView/SceneOperations.cs @@ -882,6 +882,9 @@ namespace MatterHackers.MatterControl Icons.Add(typeof(SelectionGroupObject3D), groupIconSource); } + // register legacy types so they still show, they don't have ui to create so they don't have icons set dynamically + Icons.Add(typeof(AlignObject3D), (theme) => StaticData.Instance.LoadIcon("align_left_dark.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply()); + // image operations PrimaryOperations.Add(typeof(ImageObject3D), new List { SceneOperations.ById("ImageConverter"), SceneOperations.ById("ImageToPath"), }); @@ -919,7 +922,6 @@ namespace MatterHackers.MatterControl PrimaryOperations.Add(typeof(Object3D), new List { SceneOperations.ById("Scale") }); Icons.Add(typeof(ImageObject3D), (theme) => StaticData.Instance.LoadIcon("image_converter.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply()); - // Icons.Add(typeof(CubeObject3D), (theme) => StaticData.Instance.LoadIcon("image_converter.png", 16, 16).SetToColor(theme.TextColor).SetPreMultiply()); } private static SceneOperation CombineOperation() diff --git a/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs b/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs index 03aca8c98..d5951cb03 100644 --- a/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs +++ b/MatterControlLib/Library/ContentProviders/MeshContentProvider.cs @@ -176,9 +176,9 @@ namespace MatterHackers.MatterControl // TODO: Wire up limits for thumbnail generation. If content is too big, return null allowing the thumbnail to fall back to content default object3D = await contentModel.CreateContent(); } - else if (libraryItem is ILibraryObject3D) + else if (libraryItem is ILibraryObject3D libraryObject3D) { - object3D = await (libraryItem as ILibraryObject3D)?.GetObject3D(null); + object3D = await libraryObject3D.GetObject3D(null); } if (object3D == null) diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index 8dd82c825..80691d427 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit 8dd82c825266791e6d51461bdf4de83df238dc6e +Subproject commit 80691d427aed19ef7578efa573cf3f0fd08030ee