diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-04-02 17:37:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-02 17:37:09 +0200 |
commit | b50387c8bf2737e7f100c6c32350d97301a6f2a3 (patch) | |
tree | 34402b0e324fc512a6cd8bd5bc85a3cc042fec30 /scene/3d | |
parent | 6a38ce1b318cc71c285c11f5b52f04a681c309fd (diff) | |
parent | ea7b497065a615b6fd4e165b331f50613a63a329 (diff) |
Merge pull request #37521 from akien-mga/more-nullptr
Replace more occurrences of NULL with nullptr
Diffstat (limited to 'scene/3d')
-rw-r--r-- | scene/3d/camera_3d.cpp | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/scene/3d/camera_3d.cpp b/scene/3d/camera_3d.cpp index 30ab4d463b..706c49b43b 100644 --- a/scene/3d/camera_3d.cpp +++ b/scene/3d/camera_3d.cpp @@ -413,23 +413,6 @@ Vector3 Camera3D::project_position(const Point2 &p_point, float p_z_depth) const return get_camera_transform().xform(p); } -/* -void Camera::_camera_make_current(Node *p_camera) { - - - if (p_camera==this) { - RenderingServer::get_singleton()->viewport_attach_camera(viewport_id,camera); - active=true; - } else { - if (active && p_camera==NULL) { - //detech camera because no one else will claim it - RenderingServer::get_singleton()->viewport_attach_camera(viewport_id,RID()); - } - active=false; - } -} -*/ - void Camera3D::set_environment(const Ref<Environment> &p_environment) { environment = p_environment; |