Shouldn't the whole upgrade tool be disabled with deprecated=no?
I though it's already the case, which is why I didn't add any ifdefs.

Shouldn't the whole upgrade tool be disabled with deprecated=no? I though it's already the case, which is why I didn't add any ifdefs.

I don't think it should be disabled. For me a main use case for the upgrade tool is to simply re-save all scenes and resources when upgrading to a new Godot version (so e.g. going to 4.6, all node unique IDs get generated and saved). That doesn't rely on any deprecated functionality but it would be sad not to have this feature when compiling with deprecated=no.

So I guess the ProjectSettings call (lines 82-83) should also be wrapped, even if it doesn't cause compilation errors. And possibly the mesh_instance_3d.h include.

So I guess the ProjectSettings call (lines 82-83) should also be wrapped, even if it doesn't cause compilation errors. And possibly the mesh_instance_3d.h include.

Yes, I can wrap those calls too if you'd like (given this PR's focus on compilation fixes). Or would you prefer to submit it separately?

It would make sense to make those changes in this PR as they're semantically related. So yes, please go ahead :)

Thanks!