[Bf-blender-cvs] [789effa7445] node-add-asset-menu: Merge branch 'master' into node-add-asset-menu

[Hans Goudey]

Commit: 789effa7445fb9581d0f97a85796c73aa61bd246
Author: Hans Goudey
Date:   Wed Oct 5 11:43:10 2022 -0500
Branches: node-add-asset-menu
https://developer.blender.org/rB789effa7445fb9581d0f97a85796c73aa61bd246

Merge branch 'master' into node-add-asset-menu

===================================================================



===================================================================

diff --cc release/scripts/startup/bl_ui/node_add_menu_geometry.py
index fec523e81ef,e1b57ec4f43..c076cd7395a
--- a/release/scripts/startup/bl_ui/node_add_menu_geometry.py
+++ b/release/scripts/startup/bl_ui/node_add_menu_geometry.py
@@@ -97,10 -94,9 +98,10 @@@ class NODE_MT_geometry_node_curve_topol
  
      def draw(self, _context):
          layout = self.layout
-         node_add_menu.add_node_type(layout, "GeometryNodeInputControlPointNeighbors")
+         node_add_menu.add_node_type(layout, "GeometryNodeOffsetPointInCurve")
          node_add_menu.add_node_type(layout, "GeometryNodeCurveOfPoint")
          node_add_menu.add_node_type(layout, "GeometryNodePointsOfCurve")
 +        node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
  
  
  class NODE_MT_geometry_node_GEO_GEOMETRY(Menu):
@@@ -243,7 -234,7 +244,8 @@@ class NODE_MT_category_PRIMITIVES_MESH(
          node_add_menu.add_node_type(layout, "GeometryNodeMeshIcoSphere")
          node_add_menu.add_node_type(layout, "GeometryNodeMeshCircle")
          node_add_menu.add_node_type(layout, "GeometryNodeMeshLine")
+         node_add_menu.add_node_type(layout, "GeometryNodeMeshUVSphere")
 +        node_add_menu.draw_assets_for_catalog(layout, self.bl_label)
  
  
  class NODE_MT_geometry_node_mesh_topology(Menu):