diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-05-27 17:11:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-27 17:11:31 +0200 |
| commit | ec5be4ee68d5ba0052a350cc50e4a9a8e4421659 (patch) | |
| tree | 93e9a264543a4f4e5cd85d108a496d81ee10da53 | |
| parent | bb4438889b49eadd4b1f5f5adde904336702c787 (diff) | |
| parent | ce2c45bde7dd5b245e95f1ecfba1187f945e46fe (diff) | |
Merge pull request #29223 from Jummit/add-get-camera-rid
Add get_camera_rid method to Camera
| -rw-r--r-- | doc/classes/Camera.xml | 7 | ||||
| -rw-r--r-- | scene/3d/camera.cpp | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/classes/Camera.xml b/doc/classes/Camera.xml index 05858e8bc6..0b7021b4a1 100644 --- a/doc/classes/Camera.xml +++ b/doc/classes/Camera.xml @@ -39,6 +39,13 @@ <description> </description> </method> + <method name="get_camera_rid" qualifiers="const"> + <return type="RID"> + </return> + <description> + Returns the camera's RID from the [VisualServer]. + </description> + </method> <method name="is_position_behind" qualifiers="const"> <return type="bool"> </return> diff --git a/scene/3d/camera.cpp b/scene/3d/camera.cpp index 8b91f56344..e360de5b8e 100644 --- a/scene/3d/camera.cpp +++ b/scene/3d/camera.cpp @@ -524,6 +524,7 @@ void Camera::_bind_methods() { ClassDB::bind_method(D_METHOD("set_doppler_tracking", "mode"), &Camera::set_doppler_tracking); ClassDB::bind_method(D_METHOD("get_doppler_tracking"), &Camera::get_doppler_tracking); ClassDB::bind_method(D_METHOD("get_frustum"), &Camera::get_frustum); + ClassDB::bind_method(D_METHOD("get_camera_rid"), &Camera::get_camera); ClassDB::bind_method(D_METHOD("set_cull_mask_bit", "layer", "enable"), &Camera::set_cull_mask_bit); ClassDB::bind_method(D_METHOD("get_cull_mask_bit", "layer"), &Camera::get_cull_mask_bit); |