diff --git a/src/Classes/Cel3DObject.gd b/src/Classes/Cel3DObject.gd
index cde30c429..dc145b425 100644
--- a/src/Classes/Cel3DObject.gd
+++ b/src/Classes/Cel3DObject.gd
@@ -10,6 +10,7 @@ enum Type {
 	CAPSULE,
 	CYLINDER,
 	PRISM,
+	TORUS,
 	PLANE,
 	TEXT,
 	DIR_LIGHT,
diff --git a/src/Tools/3DShapeEdit.gd b/src/Tools/3DShapeEdit.gd
index e99b1da25..7af9c91f0 100644
--- a/src/Tools/3DShapeEdit.gd
+++ b/src/Tools/3DShapeEdit.gd
@@ -59,17 +59,18 @@ func _ready() -> void:
 	Global.connect("cel_changed", self, "_cel_changed")
 	_cel_changed()
 	var new_object_popup := new_object_menu_button.get_popup()
-	new_object_popup.add_item("Box")
-	new_object_popup.add_item("Sphere")
-	new_object_popup.add_item("Capsule")
-	new_object_popup.add_item("Cylinder")
-	new_object_popup.add_item("Prism")
-	new_object_popup.add_item("Plane")
-	new_object_popup.add_item("Text")
-	new_object_popup.add_item("Directional light")
-	new_object_popup.add_item("Spotlight")
-	new_object_popup.add_item("Omnidirectional (point) light")
-	new_object_popup.add_item("Load model from file")
+	new_object_popup.add_item("Box", Cel3DObject.Type.BOX)
+	new_object_popup.add_item("Sphere", Cel3DObject.Type.SPHERE)
+	new_object_popup.add_item("Capsule", Cel3DObject.Type.CAPSULE)
+	new_object_popup.add_item("Cylinder", Cel3DObject.Type.CYLINDER)
+	new_object_popup.add_item("Prism", Cel3DObject.Type.PRISM)
+#	new_object_popup.add_item("Torus", Cel3DObject.Type.TORUS)
+	new_object_popup.add_item("Plane", Cel3DObject.Type.PLANE)
+	new_object_popup.add_item("Text", Cel3DObject.Type.TEXT)
+	new_object_popup.add_item("Directional light", Cel3DObject.Type.DIR_LIGHT)
+	new_object_popup.add_item("Spotlight", Cel3DObject.Type.SPOT_LIGHT)
+	new_object_popup.add_item("Omnidirectional (point) light", Cel3DObject.Type.OMNI_LIGHT)
+	new_object_popup.add_item("Load model from file", Cel3DObject.Type.IMPORTED)
 	new_object_popup.connect("id_pressed", self, "_add_new_object")
 	for prop in layer_properties:
 		var node: Control = layer_properties[prop]