1 files changed, 34 insertions, 32 deletions

diff --git a/scene/resources/primitive_meshes.h b/scene/resources/primitive_meshes.h
index d0ca4b10e7..bb3df9d10e 100644
--- a/scene/resources/primitive_meshes.h
+++ b/scene/resources/primitive_meshes.h
@@ -49,17 +49,19 @@ private:
 	mutable AABB aabb;
 	AABB custom_aabb;
 
-	mutable int array_len;
-	mutable int index_array_len;
+	mutable int array_len = 0;
+	mutable int index_array_len = 0;
 
 	Ref<Material> material;
-	bool flip_faces;
+	bool flip_faces = false;
 
-	mutable bool pending_request;
+	// make sure we do an update after we've finished constructing our object
+	mutable bool pending_request = true;
 	void _update() const;
 
 protected:
-	Mesh::PrimitiveType primitive_type;
+	// assume primitive triangles as the type, correct for all but one and it will change this :)
+	Mesh::PrimitiveType primitive_type = Mesh::PRIMITIVE_TRIANGLES;
 
 	static void _bind_methods();
 
@@ -104,10 +106,10 @@ class CapsuleMesh : public PrimitiveMesh {
 	GDCLASS(CapsuleMesh, PrimitiveMesh);
 
 private:
-	float radius;
-	float mid_height;
-	int radial_segments;
-	int rings;
+	float radius = 1.0;
+	float mid_height = 1.0;
+	int radial_segments = 64;
+	int rings = 8;
 
 protected:
 	static void _bind_methods();
@@ -136,10 +138,10 @@ class BoxMesh : public PrimitiveMesh {
 	GDCLASS(BoxMesh, PrimitiveMesh);
 
 private:
-	Vector3 size;
-	int subdivide_w;
-	int subdivide_h;
-	int subdivide_d;
+	Vector3 size = Vector3(2.0, 2.0, 2.0);
+	int subdivide_w = 0;
+	int subdivide_h = 0;
+	int subdivide_d = 0;
 
 protected:
 	static void _bind_methods();
@@ -169,11 +171,11 @@ class CylinderMesh : public PrimitiveMesh {
 	GDCLASS(CylinderMesh, PrimitiveMesh);
 
 private:
-	float top_radius;
-	float bottom_radius;
-	float height;
-	int radial_segments;
-	int rings;
+	float top_radius = 1.0;
+	float bottom_radius = 1.0;
+	float height = 2.0;
+	int radial_segments = 64;
+	int rings = 4;
 
 protected:
 	static void _bind_methods();
@@ -205,9 +207,9 @@ class PlaneMesh : public PrimitiveMesh {
 	GDCLASS(PlaneMesh, PrimitiveMesh);
 
 private:
-	Size2 size;
-	int subdivide_w;
-	int subdivide_d;
+	Size2 size = Size2(2.0, 2.0);
+	int subdivide_w = 0;
+	int subdivide_d = 0;
 
 protected:
 	static void _bind_methods();
@@ -233,11 +235,11 @@ class PrismMesh : public PrimitiveMesh {
 	GDCLASS(PrismMesh, PrimitiveMesh);
 
 private:
-	float left_to_right;
-	Vector3 size;
-	int subdivide_w;
-	int subdivide_h;
-	int subdivide_d;
+	float left_to_right = 0.5;
+	Vector3 size = Vector3(2.0, 2.0, 2.0);
+	int subdivide_w = 0;
+	int subdivide_h = 0;
+	int subdivide_d = 0;
 
 protected:
 	static void _bind_methods();
@@ -270,7 +272,7 @@ class QuadMesh : public PrimitiveMesh {
 	GDCLASS(QuadMesh, PrimitiveMesh);
 
 private:
-	Size2 size;
+	Size2 size = Size2(1.0, 1.0);
 
 protected:
 	static void _bind_methods();
@@ -290,11 +292,11 @@ class SphereMesh : public PrimitiveMesh {
 	GDCLASS(SphereMesh, PrimitiveMesh);
 
 private:
-	float radius;
-	float height;
-	int radial_segments;
-	int rings;
-	bool is_hemisphere;
+	float radius = 1.0;
+	float height = 2.0;
+	int radial_segments = 64;
+	int rings = 32;
+	bool is_hemisphere = false;
 
 protected:
 	static void _bind_methods();