asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #48094 from Calinou/editor-lightmap-warning-apple-silicon

Browse source 
Tweak lightmapper warning message to mention Rosetta emulation on macOS
This commit is contained in:
Rémi Verschelde 2021-04-22 16:41:59 +02:00 committed by GitHub
commit f36046f0ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
editor/plugins/baked_lightmap_editor_plugin.cpp
View file

@ -70,7 +70,11 @@ void BakedLightmapEditorPlugin::_bake_select_file(const String &p_file) {
EditorNode::get_singleton()->show_warning(TTR("Some mesh is invalid. Make sure the UV2 channel values are contained within the [0.0,1.0] square region.")); EditorNode::get_singleton()->show_warning(TTR("Some mesh is invalid. Make sure the UV2 channel values are contained within the [0.0,1.0] square region."));
break; break;
case BakedLightmap::BAKE_ERROR_NO_LIGHTMAPPER: case BakedLightmap::BAKE_ERROR_NO_LIGHTMAPPER:
EditorNode::get_singleton()->show_warning(TTR("Godot editor was built without ray tracing support, lightmaps can't be baked.")); #ifdef OSX_ENABLED
EditorNode::get_singleton()->show_warning(TTR("Godot editor was built without ray tracing support; lightmaps can't be baked.\nIf you are using an Apple Silicon-based Mac, try forcing Rosetta emulation on Godot.app in the application settings\nthen restart the editor."));
#else
EditorNode::get_singleton()->show_warning(TTR("Godot editor was built without ray tracing support; lightmaps can't be baked."));
#endif
break; break;
default: { default: {
} }