4 files changed, 70 insertions, 7 deletions

diff --git a/modules/bullet/bullet_types_converter.cpp b/modules/bullet/bullet_types_converter.cpp
index c9493d8892..7ecad9b78a 100644
--- a/modules/bullet/bullet_types_converter.cpp
+++ b/modules/bullet/bullet_types_converter.cpp
@@ -95,12 +95,61 @@ void G_TO_B(Transform const &inVal, btTransform &outVal) {
 }
 
 void UNSCALE_BT_BASIS(btTransform &scaledBasis) {
-	btMatrix3x3 &m(scaledBasis.getBasis());
-	btVector3 column0(m[0][0], m[1][0], m[2][0]);
-	btVector3 column1(m[0][1], m[1][1], m[2][1]);
-	btVector3 column2(m[0][2], m[1][2], m[2][2]);
+	btMatrix3x3 &basis(scaledBasis.getBasis());
+	btVector3 column0 = basis.getColumn(0);
+	btVector3 column1 = basis.getColumn(1);
+	btVector3 column2 = basis.getColumn(2);
+
+	// Check for zero scaling.
+	if (btFuzzyZero(column0[0])) {
+		if (btFuzzyZero(column1[1])) {
+			if (btFuzzyZero(column2[2])) {
+				// All dimensions are fuzzy zero. Create a default basis.
+				column0 = btVector3(1, 0, 0);
+				column1 = btVector3(0, 1, 0);
+				column2 = btVector3(0, 0, 1);
+			} else { // Column 2 scale not fuzzy zero.
+				// Create two vectors orthogonal to row 2.
+				// Ensure that a default basis is created if row 2 = <0, 0, 1>
+				column1 = btVector3(0, column2[2], -column2[1]);
+				column0 = column1.cross(column2);
+			}
+		} else { // Column 1 scale not fuzzy zero.
+			if (btFuzzyZero(column2[2])) {
+				// Create two vectors othogonal to column 1.
+				// Ensure that a default basis is created if column 1 = <0, 1, 0>
+				column0 = btVector3(column1[1], -column1[0], 0);
+				column2 = column0.cross(column1);
+			} else { // Column 1 and column 2 scales not fuzzy zero.
+				// Create column 0 orthogonal to column 1 and column 2.
+				column0 = column1.cross(column2);
+			}
+		}
+	} else { // Column 0 scale not fuzzy zero.
+		if (btFuzzyZero(column1[1])) {
+			if (btFuzzyZero(column2[2])) {
+				// Create two vectors orthogonal to column 0.
+				// Ensure that a default basis is created if column 0 = <1, 0, 0>
+				column2 = btVector3(-column0[2], 0, column0[0]);
+				column1 = column2.cross(column0);
+			} else { // Column 0 and column 2 scales not fuzzy zero.
+				// Create column 1 orthogonal to column 0 and column 2.
+				column1 = column2.cross(column0);
+			}
+		} else { // Column 0 and column 1 scales not fuzzy zero.
+			if (btFuzzyZero(column2[2])) {
+				// Create column 2 orthogonal to column 0 and column 1.
+				column2 = column0.cross(column1);
+			}
+		}
+	}
+
+	// Normalize
 	column0.normalize();
 	column1.normalize();
 	column2.normalize();
-	m.setValue(column0[0], column1[0], column2[0], column0[1], column1[1], column2[1], column0[2], column1[2], column2[2]);
+
+	basis.setValue(column0[0], column1[0], column2[0],
+			column0[1], column1[1], column2[1],
+			column0[2], column1[2], column2[2]);
 }
diff --git a/modules/gdnative/gdnative_library_editor_plugin.cpp b/modules/gdnative/gdnative_library_editor_plugin.cpp
index fdd755845f..f0f095ddf5 100644
--- a/modules/gdnative/gdnative_library_editor_plugin.cpp
+++ b/modules/gdnative/gdnative_library_editor_plugin.cpp
@@ -318,6 +318,7 @@ GDNativeLibraryEditor::GDNativeLibraryEditor() {
 		platform_ios.name = "iOS";
 		platform_ios.entries.push_back("armv7");
 		platform_ios.entries.push_back("arm64");
+		platform_ios.entries.push_back("x86_64");
 		// iOS can use both Static and Dynamic libraries.
 		// Frameworks is actually a folder with files.
 		platform_ios.library_extension = "*.framework; Framework, *.xcframework; Binary Framework, *.a; Static Library, *.dylib; Dynamic Library";
diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp
index 7c3af016b9..b1d8c05d87 100644
--- a/modules/visual_script/visual_script_editor.cpp
+++ b/modules/visual_script/visual_script_editor.cpp
@@ -1124,8 +1124,8 @@ void VisualScriptEditor::_update_members() {
 		TreeItem *ti = members->create_item(variables);
 
 		ti->set_text(0, E->get());
-		Variant var = script->get_variable_default_value(E->get());
-		ti->set_suffix(0, "= " + String(var));
+
+		ti->set_suffix(0, "= " + _sanitized_variant_text(E->get()));
 		ti->set_icon(0, type_icons[script->get_variable_info(E->get()).type]);
 
 		ti->set_selectable(0, true);
@@ -1167,6 +1167,18 @@ void VisualScriptEditor::_update_members() {
 	updating_members = false;
 }
 
+String VisualScriptEditor::_sanitized_variant_text(const StringName &property_name) {
+	Variant var = script->get_variable_default_value(property_name);
+
+	if (script->get_variable_info(property_name).type != Variant::NIL) {
+		Callable::CallError ce;
+		const Variant *converted = &var;
+		var = Variant::construct(script->get_variable_info(property_name).type, &converted, 1, ce, false);
+	}
+
+	return String(var);
+}
+
 void VisualScriptEditor::_member_selected() {
 	if (updating_members) {
 		return;
diff --git a/modules/visual_script/visual_script_editor.h b/modules/visual_script/visual_script_editor.h
index b5d5589250..66e435741f 100644
--- a/modules/visual_script/visual_script_editor.h
+++ b/modules/visual_script/visual_script_editor.h
@@ -146,6 +146,7 @@ class VisualScriptEditor : public ScriptEditorBase {
 	bool updating_members;
 
 	void _update_members();
+	String _sanitized_variant_text(const StringName &property_name);
 
 	StringName selected;