There are probably many more cases in which the menu looks a little different. However, I don't know them all and it's too easy to break something accidentally here. Maybe a user could try the different combinations of object types and check if there are entries that should not be there. Reviewers: brecht Differential Revision: https://developer.blender.org/D4240