summaryrefslogtreecommitdiffstats
path: root/servers/rendering_server.h
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2022-09-02 13:57:02 +0200
committerRémi Verschelde <rverschelde@gmail.com>2022-09-02 13:57:02 +0200
commit3a62c294c72f30f3186403fa57533b4226899e53 (patch)
treee9f9c9923194ffe513001cccdcf331e71b013947 /servers/rendering_server.h
parentfe0b893dc7657e7543e62cd1793745c34f82ae66 (diff)
parent7adc8376ed79f016730845ea3a93f4015b95149e (diff)
downloadredot-engine-3a62c294c72f30f3186403fa57533b4226899e53.tar.gz
Merge pull request #65170 from KoBeWi/your_argument_is_TypedArray
Diffstat (limited to 'servers/rendering_server.h')
-rw-r--r--servers/rendering_server.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/servers/rendering_server.h b/servers/rendering_server.h
index b69001fd57..67ba407775 100644
--- a/servers/rendering_server.h
+++ b/servers/rendering_server.h
@@ -1223,7 +1223,7 @@ public:
PackedInt64Array _instances_cull_aabb_bind(const AABB &p_aabb, RID p_scenario = RID()) const;
PackedInt64Array _instances_cull_ray_bind(const Vector3 &p_from, const Vector3 &p_to, RID p_scenario = RID()) const;
- PackedInt64Array _instances_cull_convex_bind(const Array &p_convex, RID p_scenario = RID()) const;
+ PackedInt64Array _instances_cull_convex_bind(const TypedArray<Plane> &p_convex, RID p_scenario = RID()) const;
enum InstanceFlags {
INSTANCE_FLAG_USE_BAKED_LIGHT,
@@ -1269,7 +1269,7 @@ public:
BAKE_CHANNEL_EMISSION
};
- virtual TypedArray<Image> bake_render_uv2(RID p_base, const Vector<RID> &p_material_overrides, const Size2i &p_image_size) = 0;
+ virtual TypedArray<Image> bake_render_uv2(RID p_base, const TypedArray<RID> &p_material_overrides, const Size2i &p_image_size) = 0;
/* CANVAS (2D) */