Merge pull request #9639 from rminderhoud/primitives

Moved binds of PRIMITIVE_* contants from ArrayMesh to Mesh

3 files changed, 34 insertions, 29 deletions

diff --git a/doc/base/classes.xml b/doc/base/classes.xml
index 5e8eaffa33..e0255c279e 100644
--- a/doc/base/classes.xml
+++ b/doc/base/classes.xml
@@ -5057,27 +5057,6 @@
 		<constant name="ARRAY_FORMAT_INDEX" value="256">
 			Index array will be used.
 		</constant>
-		<constant name="PRIMITIVE_POINTS" value="0">
-			Render array as points (one vertex equals one point).
-		</constant>
-		<constant name="PRIMITIVE_LINES" value="1">
-			Render array as lines (every two vertices a line is created).
-		</constant>
-		<constant name="PRIMITIVE_LINE_STRIP" value="2">
-			Render array as line strip.
-		</constant>
-		<constant name="PRIMITIVE_LINE_LOOP" value="3">
-			Render array as line loop (like line strip, but closed).
-		</constant>
-		<constant name="PRIMITIVE_TRIANGLES" value="4">
-			Render array as triangles (every three vertices a triangle is created).
-		</constant>
-		<constant name="PRIMITIVE_TRIANGLE_STRIP" value="5">
-			Render array as triangle strips.
-		</constant>
-		<constant name="PRIMITIVE_TRIANGLE_FAN" value="6">
-			Render array as triangle fans.
-		</constant>
 	</constants>
 </class>
 <class name="AtlasTexture" inherits="Texture" category="Core">
@@ -24341,6 +24320,27 @@
 		</method>
 	</methods>
 	<constants>
+		<constant name="PRIMITIVE_POINTS" value="0">
+			Render array as points (one vertex equals one point).
+		</constant>
+		<constant name="PRIMITIVE_LINES" value="1">
+			Render array as lines (every two vertices a line is created).
+		</constant>
+		<constant name="PRIMITIVE_LINE_STRIP" value="2">
+			Render array as line strip.
+		</constant>
+		<constant name="PRIMITIVE_LINE_LOOP" value="3">
+			Render array as line loop (like line strip, but closed).
+		</constant>
+		<constant name="PRIMITIVE_TRIANGLES" value="4">
+			Render array as triangles (every three vertices a triangle is created).
+		</constant>
+		<constant name="PRIMITIVE_TRIANGLE_STRIP" value="5">
+			Render array as triangle strips.
+		</constant>
+		<constant name="PRIMITIVE_TRIANGLE_FAN" value="6">
+			Render array as triangle fans.
+		</constant>
 	</constants>
 </class>
 <class name="MeshDataTool" inherits="Reference" category="Core">
diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp
index ef7011b2af..414d0a6240 100644
--- a/scene/resources/mesh.cpp
+++ b/scene/resources/mesh.cpp
@@ -413,6 +413,17 @@ Ref<Mesh> Mesh::create_outline(float p_margin) const {
 	return newmesh;
 }
 
+void Mesh::_bind_methods() {
+
+	BIND_CONSTANT(PRIMITIVE_POINTS);
+	BIND_CONSTANT(PRIMITIVE_LINES);
+	BIND_CONSTANT(PRIMITIVE_LINE_STRIP);
+	BIND_CONSTANT(PRIMITIVE_LINE_LOOP);
+	BIND_CONSTANT(PRIMITIVE_TRIANGLES);
+	BIND_CONSTANT(PRIMITIVE_TRIANGLE_STRIP);
+	BIND_CONSTANT(PRIMITIVE_TRIANGLE_FAN);
+}
+
 Mesh::Mesh() {
 }
 
@@ -1034,14 +1045,6 @@ void ArrayMesh::_bind_methods() {
 	BIND_CONSTANT(ARRAY_FORMAT_BONES);
 	BIND_CONSTANT(ARRAY_FORMAT_WEIGHTS);
 	BIND_CONSTANT(ARRAY_FORMAT_INDEX);
-
-	BIND_CONSTANT(PRIMITIVE_POINTS);
-	BIND_CONSTANT(PRIMITIVE_LINES);
-	BIND_CONSTANT(PRIMITIVE_LINE_STRIP);
-	BIND_CONSTANT(PRIMITIVE_LINE_LOOP);
-	BIND_CONSTANT(PRIMITIVE_TRIANGLES);
-	BIND_CONSTANT(PRIMITIVE_TRIANGLE_STRIP);
-	BIND_CONSTANT(PRIMITIVE_TRIANGLE_FAN);
 }
 
 ArrayMesh::ArrayMesh() {
diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h
index f716b59fe9..4adb871e09 100644
--- a/scene/resources/mesh.h
+++ b/scene/resources/mesh.h
@@ -46,6 +46,8 @@ class Mesh : public Resource {
 protected:
 	void _clear_triangle_mesh();
 
+	static void _bind_methods();
+
 public:
 	enum {