diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-02 13:57:02 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-09-02 13:57:02 +0200 |
| commit | 3a62c294c72f30f3186403fa57533b4226899e53 (patch) | |
| tree | e9f9c9923194ffe513001cccdcf331e71b013947 /servers/rendering_server.cpp | |
| parent | fe0b893dc7657e7543e62cd1793745c34f82ae66 (diff) | |
| parent | 7adc8376ed79f016730845ea3a93f4015b95149e (diff) | |
| download | redot-engine-3a62c294c72f30f3186403fa57533b4226899e53.tar.gz | |
Merge pull request #65170 from KoBeWi/your_argument_is_TypedArray
Diffstat (limited to 'servers/rendering_server.cpp')
| -rw-r--r-- | servers/rendering_server.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering_server.cpp b/servers/rendering_server.cpp index 1328d01b85..aa3351c815 100644 --- a/servers/rendering_server.cpp +++ b/servers/rendering_server.cpp @@ -95,7 +95,7 @@ PackedInt64Array RenderingServer::_instances_cull_ray_bind(const Vector3 &p_from return to_int_array(ids); } -PackedInt64Array RenderingServer::_instances_cull_convex_bind(const Array &p_convex, RID p_scenario) const { +PackedInt64Array RenderingServer::_instances_cull_convex_bind(const TypedArray<Plane> &p_convex, RID p_scenario) const { if (RSG::threaded) { WARN_PRINT_ONCE("Using this function with a threaded renderer hurts performance, as it causes a server stall."); } @@ -1633,7 +1633,7 @@ TypedArray<Dictionary> RenderingServer::_instance_geometry_get_shader_parameter_ } TypedArray<Image> RenderingServer::_bake_render_uv2(RID p_base, const TypedArray<RID> &p_material_overrides, const Size2i &p_image_size) { - Vector<RID> mat_overrides; + TypedArray<RID> mat_overrides; for (int i = 0; i < p_material_overrides.size(); i++) { mat_overrides.push_back(p_material_overrides[i]); } |