1 files changed, 12 insertions, 22 deletions

diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc
index ff6294b9b6b..02e7247fe59 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc
@@ -89,8 +89,7 @@ static void node_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 
 static void node_init(bNodeTree *UNUSED(tree), bNode *node)
 {
-  NodeGeometryCurvePrimitiveQuad *data = (NodeGeometryCurvePrimitiveQuad *)MEM_callocN(
-      sizeof(NodeGeometryCurvePrimitiveQuad), __func__);
+  NodeGeometryCurvePrimitiveQuad *data = MEM_cnew<NodeGeometryCurvePrimitiveQuad>(__func__);
   data->mode = GEO_NODE_CURVE_PRIMITIVE_QUAD_MODE_RECTANGLE;
   node->storage = data;
 }
@@ -113,35 +112,26 @@ static void node_update(bNodeTree *ntree, bNode *node)
   bNodeSocket *p3 = p2->next;
   bNodeSocket *p4 = p3->next;
 
-  LISTBASE_FOREACH (bNodeSocket *, sock, &node->inputs) {
-    nodeSetSocketAvailability(ntree, sock, false);
-  }
+  Vector<bNodeSocket *> available_sockets;
 
   if (mode == GEO_NODE_CURVE_PRIMITIVE_QUAD_MODE_RECTANGLE) {
-    nodeSetSocketAvailability(ntree, width, true);
-    nodeSetSocketAvailability(ntree, height, true);
+    available_sockets.extend({width, height});
   }
   else if (mode == GEO_NODE_CURVE_PRIMITIVE_QUAD_MODE_PARALLELOGRAM) {
-    nodeSetSocketAvailability(ntree, width, true);
-    nodeSetSocketAvailability(ntree, height, true);
-    nodeSetSocketAvailability(ntree, offset, true);
+    available_sockets.extend({width, height, offset});
   }
   else if (mode == GEO_NODE_CURVE_PRIMITIVE_QUAD_MODE_TRAPEZOID) {
-    nodeSetSocketAvailability(ntree, bottom, true);
-    nodeSetSocketAvailability(ntree, top, true);
-    nodeSetSocketAvailability(ntree, offset, true);
-    nodeSetSocketAvailability(ntree, height, true);
+    available_sockets.extend({bottom, top, offset, height});
   }
   else if (mode == GEO_NODE_CURVE_PRIMITIVE_QUAD_MODE_KITE) {
-    nodeSetSocketAvailability(ntree, width, true);
-    nodeSetSocketAvailability(ntree, bottom_height, true);
-    nodeSetSocketAvailability(ntree, top_height, true);
+    available_sockets.extend({width, bottom_height, top_height});
   }
   else if (mode == GEO_NODE_CURVE_PRIMITIVE_QUAD_MODE_POINTS) {
-    nodeSetSocketAvailability(ntree, p1, true);
-    nodeSetSocketAvailability(ntree, p2, true);
-    nodeSetSocketAvailability(ntree, p3, true);
-    nodeSetSocketAvailability(ntree, p4, true);
+    available_sockets.extend({p1, p2, p3, p4});
+  }
+
+  LISTBASE_FOREACH (bNodeSocket *, sock, &node->inputs) {
+    nodeSetSocketAvailability(ntree, sock, available_sockets.contains(sock));
   }
 }
 
@@ -299,7 +289,7 @@ void register_node_type_geo_curve_primitive_quadrilateral()
 
   static bNodeType ntype;
   geo_node_type_base(
-      &ntype, GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL, "Quadrilateral", NODE_CLASS_GEOMETRY, 0);
+      &ntype, GEO_NODE_CURVE_PRIMITIVE_QUADRILATERAL, "Quadrilateral", NODE_CLASS_GEOMETRY);
   ntype.declare = file_ns::node_declare;
   ntype.geometry_node_execute = file_ns::node_geo_exec;
   ntype.draw_buttons = file_ns::node_layout;