diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-13 11:37:37 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-13 12:37:45 +0100 |
| commit | 54ac8eaba661a599983ae4774113d1a15cfa461a (patch) | |
| tree | 6f302875ff4008d0f4a51a91fea59933a2a73eea /scene/resources/multimesh.cpp | |
| parent | f1ac2920847eafb7e89a27dcb98ecd4ee68b9750 (diff) | |
| download | redot-engine-54ac8eaba661a599983ae4774113d1a15cfa461a.tar.gz | |
Remove more deprecated methods and code
Diffstat (limited to 'scene/resources/multimesh.cpp')
| -rw-r--r-- | scene/resources/multimesh.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/scene/resources/multimesh.cpp b/scene/resources/multimesh.cpp index 946511c766..9c34ae0504 100644 --- a/scene/resources/multimesh.cpp +++ b/scene/resources/multimesh.cpp @@ -29,9 +29,11 @@ /*************************************************************************/ #include "multimesh.h" + #include "servers/visual_server.h" #ifndef DISABLE_DEPRECATED +// Kept for compatibility from 3.x to 4.0. void MultiMesh::_set_transform_array(const PoolVector<Vector3> &p_array) { if (transform_format != TRANSFORM_3D) @@ -193,8 +195,8 @@ PoolVector<Color> MultiMesh::_get_custom_data_array() const { return custom_datas; } +#endif // DISABLE_DEPRECATED -#endif void MultiMesh::set_buffer(const PoolVector<float> &p_buffer) { VS::get_singleton()->multimesh_set_buffer(multimesh, p_buffer); } @@ -351,8 +353,7 @@ void MultiMesh::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::POOL_REAL_ARRAY, "buffer", PROPERTY_HINT_NONE), "set_buffer", "get_buffer"); #ifndef DISABLE_DEPRECATED - //kept for compatibility - + // Kept for compatibility from 3.x to 4.0. ClassDB::bind_method(D_METHOD("_set_transform_array"), &MultiMesh::_set_transform_array); ClassDB::bind_method(D_METHOD("_get_transform_array"), &MultiMesh::_get_transform_array); ClassDB::bind_method(D_METHOD("_set_transform_2d_array"), &MultiMesh::_set_transform_2d_array); @@ -367,6 +368,7 @@ void MultiMesh::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::POOL_COLOR_ARRAY, "color_array", PROPERTY_HINT_NONE, "", 0), "_set_color_array", "_get_color_array"); ADD_PROPERTY(PropertyInfo(Variant::POOL_COLOR_ARRAY, "custom_data_array", PROPERTY_HINT_NONE, "", 0), "_set_custom_data_array", "_get_custom_data_array"); #endif + BIND_ENUM_CONSTANT(TRANSFORM_2D); BIND_ENUM_CONSTANT(TRANSFORM_3D); } |