diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-02-18 11:27:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-18 11:27:04 +0100 |
| commit | ef5891091bceef2800b4fae4cd85af219e791467 (patch) | |
| tree | 8d58cca8cae2c34d408450cfb5ceb198543147b7 /editor/plugins/mesh_instance_editor_plugin.cpp | |
| parent | c7faf2e16b684f3dd0246dbdb662b1826dd24571 (diff) | |
| parent | 3205a92ad872f918c8322cdcd1434c231a1fd251 (diff) | |
| download | redot-engine-ef5891091bceef2800b4fae4cd85af219e791467.tar.gz | |
Merge pull request #36311 from reduz/poolvector-deprecation
Convert all references and instances of PoolVector to Vector
Diffstat (limited to 'editor/plugins/mesh_instance_editor_plugin.cpp')
| -rw-r--r-- | editor/plugins/mesh_instance_editor_plugin.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/editor/plugins/mesh_instance_editor_plugin.cpp b/editor/plugins/mesh_instance_editor_plugin.cpp index aaba6406c7..574646956e 100644 --- a/editor/plugins/mesh_instance_editor_plugin.cpp +++ b/editor/plugins/mesh_instance_editor_plugin.cpp @@ -327,24 +327,24 @@ void MeshInstanceEditor::_create_uv_lines(int p_layer) { continue; Array a = mesh->surface_get_arrays(i); - PoolVector<Vector2> uv = a[p_layer == 0 ? Mesh::ARRAY_TEX_UV : Mesh::ARRAY_TEX_UV2]; + Vector<Vector2> uv = a[p_layer == 0 ? Mesh::ARRAY_TEX_UV : Mesh::ARRAY_TEX_UV2]; if (uv.size() == 0) { err_dialog->set_text(TTR("Model has no UV in this layer")); err_dialog->popup_centered_minsize(); return; } - PoolVector<Vector2>::Read r = uv.read(); + const Vector2 *r = uv.ptr(); - PoolVector<int> indices = a[Mesh::ARRAY_INDEX]; - PoolVector<int>::Read ri; + Vector<int> indices = a[Mesh::ARRAY_INDEX]; + const int *ri; int ic; bool use_indices; if (indices.size()) { ic = indices.size(); - ri = indices.read(); + ri = indices.ptr(); use_indices = true; } else { ic = uv.size(); |
