diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index 8af5a1067cf..8e7e63a871d 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/scripts/startup/bl_ui/space_view3d.py @@ -3281,7 +3281,7 @@ class VIEW3D_MT_object_convert(Menu): if ob and ob.type == 'CURVES': layout.operator("curves.convert_to_particle_system", text="Particle System") - + layout.template_node_operator_asset_menu_items(catalog_path="Object/Convert") diff --git a/tests/python/bl_node_field_type_inference.py b/tests/python/bl_node_field_type_inference.py index 896430b7733..e38ece23410 100644 --- a/tests/python/bl_node_field_type_inference.py +++ b/tests/python/bl_node_field_type_inference.py @@ -43,13 +43,28 @@ class FieldTypeInferenceTest(unittest.TestCase): return 'Unknown' def assert_value_socket(self, socket): - self.assertEqual(socket.display_shape, 'CIRCLE', "Socket {} must be Single Value, but is {}".format(socket.name, self.field_type_name(socket))) + self.assertEqual( + socket.display_shape, + 'CIRCLE', + "Socket {} must be Single Value, but is {}".format( + socket.name, + self.field_type_name(socket))) def assert_field_socket(self, socket): - self.assertEqual(socket.display_shape, 'DIAMOND', "Socket {} must be Field, but is {}".format(socket.name, self.field_type_name(socket))) + self.assertEqual( + socket.display_shape, + 'DIAMOND', + "Socket {} must be Field, but is {}".format( + socket.name, + self.field_type_name(socket))) def assert_value_or_field_socket(self, socket): - self.assertEqual(socket.display_shape, 'DIAMOND_DOT', "Socket {} must be Field or Single Value, but is {}".format(socket.name, self.field_type_name(socket))) + self.assertEqual( + socket.display_shape, + 'DIAMOND_DOT', + "Socket {} must be Field or Single Value, but is {}".format( + socket.name, + self.field_type_name(socket))) def find_input_link(self, socket): for link in socket.id_data.links: @@ -417,7 +432,6 @@ class FieldTypeInferenceTest(unittest.TestCase): self.assert_value_or_field_socket(node.outputs['Attribute.004']) - def main(): global args import argparse