summaryrefslogtreecommitdiff
path: root/scene/resources
diff options
context:
space:
mode:
authorRalph Minderhoud <ralphminderhoud@gmail.com>2017-07-13 17:15:55 -0500
committerRalph Minderhoud <ralphminderhoud@gmail.com>2017-07-14 08:46:21 -0500
commitbf18c35dd7e1e74da4ee23eddb2f638ab09c3650 (patch)
treeaca0654e7e5dc600ccd4173adced9facb761a75e /scene/resources
parent9a502d3c17d4701b0fd8390e515c52a69dc0bf85 (diff)
Moved binds of PRIMITIVE_* contants from ArrayMesh to Mesh
Diffstat (limited to 'scene/resources')
-rw-r--r--scene/resources/mesh.cpp19
-rw-r--r--scene/resources/mesh.h2
2 files changed, 13 insertions, 8 deletions
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 {