Post merge fixes

src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/Points/RasterizePointsNode.cs

@@ -1 +0,0 @@
-

src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/Shapes/EllipseNode.cs

@@ -6,7 +6,7 @@ using ShapeData = PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.Shapes.D
 
 namespace PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.Shapes;
 
-[NodeInfo("Ellipse", "ELLIPSE_NODE", Category = "SHAPE")]
+[NodeInfo("Ellipse")]
 public class EllipseNode : ShapeNode<EllipseData>
 {
     public InputProperty<VecD> Position { get; }

src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/Shapes/RasterizeShape.cs → src/PixiEditor.ChangeableDocument/Changeables/Graph/Nodes/Shapes/RasterizeShapeNode.cs

@@ -8,15 +8,15 @@ using ShapeData = PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.Shapes.D
 
 namespace PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.Shapes;
 
-[NodeInfo("RasterizeShape", "RASTERIZE_SHAPE", Category = "SHAPE")]
-public class RasterizeShape : Node
+[NodeInfo("RasterizeShape")]
+public class RasterizeShapeNode : Node
 {
     public OutputProperty<Texture> Image { get; }
 
     public InputProperty<ShapeData> Data { get; }
 
 
-    public RasterizeShape()
+    public RasterizeShapeNode()
     {
         Image = CreateOutput<Texture>("Image", "IMAGE", null);
         Data = CreateInput<ShapeData>("Points", "SHAPE", null);
@@ -39,5 +39,5 @@ public class RasterizeShape : Node
         return image;
     }
 
-    public override Node CreateCopy() => new RasterizeShape();
+    public override Node CreateCopy() => new RasterizeShapeNode();
 }

src/PixiEditor/Data/Localization/Languages/en.json

@@ -739,7 +739,6 @@
   "ANIMATION": "Animation",
   "SAMPLE_IMAGE": "Sample Image",
   "POSITION": "Position",
-  "SAMPLE_IMAGE": "Sample Image",
   "MATH_ADD": "Add",
   "MATH_SUBTRACT": "Subtract",
   "MULTIPLY": "Multiply",

src/PixiEditor/ViewModels/Document/Nodes/EllipseNodeViewModel.cs

@@ -1,8 +0,0 @@
-using PixiEditor.ChangeableDocument.Changeables.Graph.Nodes;
-using PixiEditor.Extensions.Common.Localization;
-using PixiEditor.ViewModels.Nodes;
-
-namespace PixiEditor.ViewModels.Document.Nodes;
-
-[NodeViewModel("ELLIPSE_NODE", "SHAPE", "\ue90d")]
-internal class EllipseNodeViewModel : NodeViewModel<EllipseNode>;

src/PixiEditor/ViewModels/Document/Nodes/Points/RasterizePointsNodeViewModel.cs

@@ -1,7 +0,0 @@
-using PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.Points;
-using PixiEditor.ViewModels.Nodes;
-
-namespace PixiEditor.ViewModels.Document.Nodes.Points;
-
-[NodeViewModel("RASTERIZE_POINTS", "SHAPE", "\ue906")]
-internal class RasterizePointsNodeViewModel : NodeViewModel<RasterizePointsNode>;

src/PixiEditor/ViewModels/Document/Nodes/Points/DistributePointsNodeViewModel.cs → src/PixiEditor/ViewModels/Document/Nodes/Shapes/DistributePointsNodeViewModel.cs

@@ -1,7 +1,7 @@
-using PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.Points;
+using PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.Shapes;
 using PixiEditor.ViewModels.Nodes;
 
-namespace PixiEditor.ViewModels.Document.Nodes.Points;
+namespace PixiEditor.ViewModels.Document.Nodes.Shapes;
 
 [NodeViewModel("DISTRIBUTE_POINTS", "SHAPE", "\ue90a")]
 internal class DistributePointsNodeViewModel : NodeViewModel<DistributePointsNode>;

src/PixiEditor/ViewModels/Document/Nodes/Shapes/EllipseNodeViewModel.cs

@@ -0,0 +1,7 @@
+using PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.Shapes;
+using PixiEditor.ViewModels.Nodes;
+
+namespace PixiEditor.ViewModels.Document.Nodes.Shapes;
+
+[NodeViewModel("ELLIPSE_NODE", "SHAPE", "\ue90d")]
+internal class EllipseNodeViewModel : NodeViewModel<EllipseNode>;

src/PixiEditor/ViewModels/Document/Nodes/Shapes/RasterizeShapeNodeViewModel.cs

@@ -0,0 +1,7 @@
+using PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.Shapes;
+using PixiEditor.ViewModels.Nodes;
+
+namespace PixiEditor.ViewModels.Document.Nodes.Shapes;
+
+[NodeViewModel("RASTERIZE_SHAPE", "SHAPE", "\ue906")]
+internal class RasterizeShapeNodeViewModel : NodeViewModel<RasterizeShapeNode>;

src/PixiEditor/ViewModels/Document/Nodes/Points/RemoveClosePointsNodeViewModel.cs → src/PixiEditor/ViewModels/Document/Nodes/Shapes/RemoveClosePointsNodeViewModel.cs

@@ -1,7 +1,7 @@
-using PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.Points;
+using PixiEditor.ChangeableDocument.Changeables.Graph.Nodes.Shapes;
 using PixiEditor.ViewModels.Nodes;
 
-namespace PixiEditor.ViewModels.Document.Nodes.Points;
+namespace PixiEditor.ViewModels.Document.Nodes.Shapes;
 
 [NodeViewModel("REMOVE_CLOSE_POINTS", "SHAPE", "\ue914")]
 internal class RemoveClosePointsNodeViewModel : NodeViewModel<RemoveClosePointsNode>;