5 files changed, 28 insertions, 20 deletions
diff --git a/modules/csg/csg.cpp b/modules/csg/csg.cpp
index 82dc4a4175..760ee0846d 100644
--- a/modules/csg/csg.cpp
+++ b/modules/csg/csg.cpp
@@ -1336,9 +1336,9 @@ CSGBrushOperation::Build2DFaces::Build2DFaces(const CSGBrush &p_brush, int p_fac
 
 	plane = Plane(points_3D[0], points_3D[1], points_3D[2]);
 	to_3D.origin = points_3D[0];
-	to_3D.basis.set_axis(2, plane.normal);
-	to_3D.basis.set_axis(0, (points_3D[1] - points_3D[2]).normalized());
-	to_3D.basis.set_axis(1, to_3D.basis.get_axis(0).cross(to_3D.basis.get_axis(2)).normalized());
+	to_3D.basis.set_column(2, plane.normal);
+	to_3D.basis.set_column(0, (points_3D[1] - points_3D[2]).normalized());
+	to_3D.basis.set_column(1, to_3D.basis.get_column(0).cross(to_3D.basis.get_column(2)).normalized());
 	to_2D = to_3D.affine_inverse();
 
 	Face2D face;
diff --git a/modules/csg/csg_shape.cpp b/modules/csg/csg_shape.cpp
index be9bf9538f..0a2427e4e6 100644
--- a/modules/csg/csg_shape.cpp
+++ b/modules/csg/csg_shape.cpp
@@ -1110,7 +1110,7 @@ Ref<Material> CSGSphere3D::get_material() const {
 
 CSGSphere3D::CSGSphere3D() {
 	// defaults
-	radius = 1.0;
+	radius = 0.5;
 	radial_segments = 12;
 	rings = 6;
 	smooth_faces = true;
diff --git a/modules/csg/doc_classes/CSGSphere3D.xml b/modules/csg/doc_classes/CSGSphere3D.xml
index 227f620a4e..d2f985b3a2 100644
--- a/modules/csg/doc_classes/CSGSphere3D.xml
+++ b/modules/csg/doc_classes/CSGSphere3D.xml
@@ -17,7 +17,7 @@
 		<member name="radial_segments" type="int" setter="set_radial_segments" getter="get_radial_segments" default="12">
 			Number of vertical slices for the sphere.
 		</member>
-		<member name="radius" type="float" setter="set_radius" getter="get_radius" default="1.0">
+		<member name="radius" type="float" setter="set_radius" getter="get_radius" default="0.5">
 			Radius of the sphere.
 		</member>
 		<member name="rings" type="int" setter="set_rings" getter="get_rings" default="6">
diff --git a/modules/csg/register_types.cpp b/modules/csg/register_types.cpp
index 72ed027dc9..9b5888dafe 100644
--- a/modules/csg/register_types.cpp
+++ b/modules/csg/register_types.cpp
@@ -38,23 +38,29 @@
 #include "editor/csg_gizmos.h"
 #endif
 
-void register_csg_types() {
-	GDREGISTER_ABSTRACT_CLASS(CSGShape3D);
-	GDREGISTER_ABSTRACT_CLASS(CSGPrimitive3D);
-	GDREGISTER_CLASS(CSGMesh3D);
-	GDREGISTER_CLASS(CSGSphere3D);
-	GDREGISTER_CLASS(CSGBox3D);
-	GDREGISTER_CLASS(CSGCylinder3D);
-	GDREGISTER_CLASS(CSGTorus3D);
-	GDREGISTER_CLASS(CSGPolygon3D);
-	GDREGISTER_CLASS(CSGCombiner3D);
-
+void initialize_csg_module(ModuleInitializationLevel p_level) {
+	if (p_level == MODULE_INITIALIZATION_LEVEL_SCENE) {
+		GDREGISTER_ABSTRACT_CLASS(CSGShape3D);
+		GDREGISTER_ABSTRACT_CLASS(CSGPrimitive3D);
+		GDREGISTER_CLASS(CSGMesh3D);
+		GDREGISTER_CLASS(CSGSphere3D);
+		GDREGISTER_CLASS(CSGBox3D);
+		GDREGISTER_CLASS(CSGCylinder3D);
+		GDREGISTER_CLASS(CSGTorus3D);
+		GDREGISTER_CLASS(CSGPolygon3D);
+		GDREGISTER_CLASS(CSGCombiner3D);
+	}
 #ifdef TOOLS_ENABLED
-	EditorPlugins::add_by_type<EditorPluginCSG>();
+	if (p_level == MODULE_INITIALIZATION_LEVEL_EDITOR) {
+		EditorPlugins::add_by_type<EditorPluginCSG>();
+	}
 #endif
 }
 
-void unregister_csg_types() {
+void uninitialize_csg_module(ModuleInitializationLevel p_level) {
+	if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE) {
+		return;
+	}
 }
 
 #endif // _3D_DISABLED
diff --git a/modules/csg/register_types.h b/modules/csg/register_types.h
index 59d84dd52a..ec65adde9c 100644
--- a/modules/csg/register_types.h
+++ b/modules/csg/register_types.h
@@ -31,7 +31,9 @@
 #ifndef CSG_REGISTER_TYPES_H
 #define CSG_REGISTER_TYPES_H
 
-void register_csg_types();
-void unregister_csg_types();
+#include "modules/register_module_types.h"
+
+void initialize_csg_module(ModuleInitializationLevel p_level);
+void uninitialize_csg_module(ModuleInitializationLevel p_level);
 
 #endif // CSG_REGISTER_TYPES_H