diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2023-02-21 08:47:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-21 08:47:15 +0100 |
| commit | fe08570ac5f4928a0270bdf12377f34942cfb30f (patch) | |
| tree | d0d9a06493bcd07a0a76d536af4fb4fd8cf37b01 /modules | |
| parent | 812b1a40882a5e313be1db6052332c622a36eb1e (diff) | |
| parent | 84658b47ca41bc03ec0ba51aa5df92002d697e7c (diff) | |
Merge pull request #73667 from aaronfranke/gltf-unused-joint-bool
Remove unused joint boolean in GLTFNode
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gltf/doc_classes/GLTFNode.xml | 2 | ||||
| -rw-r--r-- | modules/gltf/structures/gltf_node.cpp | 11 | ||||
| -rw-r--r-- | modules/gltf/structures/gltf_node.h | 3 |
3 files changed, 0 insertions, 16 deletions
diff --git a/modules/gltf/doc_classes/GLTFNode.xml b/modules/gltf/doc_classes/GLTFNode.xml index 8e48066623..f3b3e61501 100644 --- a/modules/gltf/doc_classes/GLTFNode.xml +++ b/modules/gltf/doc_classes/GLTFNode.xml @@ -35,8 +35,6 @@ </member> <member name="height" type="int" setter="set_height" getter="get_height" default="-1"> </member> - <member name="joint" type="bool" setter="set_joint" getter="get_joint" default="false"> - </member> <member name="light" type="int" setter="set_light" getter="get_light" default="-1"> </member> <member name="mesh" type="int" setter="set_mesh" getter="get_mesh" default="-1"> diff --git a/modules/gltf/structures/gltf_node.cpp b/modules/gltf/structures/gltf_node.cpp index 66d1eaad51..30895034a9 100644 --- a/modules/gltf/structures/gltf_node.cpp +++ b/modules/gltf/structures/gltf_node.cpp @@ -45,8 +45,6 @@ void GLTFNode::_bind_methods() { ClassDB::bind_method(D_METHOD("set_skin", "skin"), &GLTFNode::set_skin); ClassDB::bind_method(D_METHOD("get_skeleton"), &GLTFNode::get_skeleton); ClassDB::bind_method(D_METHOD("set_skeleton", "skeleton"), &GLTFNode::set_skeleton); - ClassDB::bind_method(D_METHOD("get_joint"), &GLTFNode::get_joint); - ClassDB::bind_method(D_METHOD("set_joint", "joint"), &GLTFNode::set_joint); ClassDB::bind_method(D_METHOD("get_position"), &GLTFNode::get_position); ClassDB::bind_method(D_METHOD("set_position", "position"), &GLTFNode::set_position); ClassDB::bind_method(D_METHOD("get_rotation"), &GLTFNode::get_rotation); @@ -67,7 +65,6 @@ void GLTFNode::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::INT, "camera"), "set_camera", "get_camera"); // GLTFCameraIndex ADD_PROPERTY(PropertyInfo(Variant::INT, "skin"), "set_skin", "get_skin"); // GLTFSkinIndex ADD_PROPERTY(PropertyInfo(Variant::INT, "skeleton"), "set_skeleton", "get_skeleton"); // GLTFSkeletonIndex - ADD_PROPERTY(PropertyInfo(Variant::BOOL, "joint"), "set_joint", "get_joint"); // bool ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "position"), "set_position", "get_position"); // Vector3 ADD_PROPERTY(PropertyInfo(Variant::QUATERNION, "rotation"), "set_rotation", "get_rotation"); // Quaternion ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "scale"), "set_scale", "get_scale"); // Vector3 @@ -131,14 +128,6 @@ void GLTFNode::set_skeleton(GLTFSkeletonIndex p_skeleton) { skeleton = p_skeleton; } -bool GLTFNode::get_joint() { - return joint; -} - -void GLTFNode::set_joint(bool p_joint) { - joint = p_joint; -} - Vector3 GLTFNode::get_position() { return position; } diff --git a/modules/gltf/structures/gltf_node.h b/modules/gltf/structures/gltf_node.h index d801a4cc2c..95c80861de 100644 --- a/modules/gltf/structures/gltf_node.h +++ b/modules/gltf/structures/gltf_node.h @@ -80,9 +80,6 @@ public: GLTFSkeletonIndex get_skeleton(); void set_skeleton(GLTFSkeletonIndex p_skeleton); - bool get_joint(); - void set_joint(bool p_joint); - Vector3 get_position(); void set_position(Vector3 p_position); |