summaryrefslogtreecommitdiff
path: root/scene/3d/interpolated_camera.cpp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-09-12 11:57:49 +0200
committerGitHub <noreply@github.com>2017-09-12 11:57:49 +0200
commitcf941fdc357791a93bd9ab9eaf16898e0c218ff3 (patch)
tree546d046bffd826359c85240ae4562ef5df734e86 /scene/3d/interpolated_camera.cpp
parent84ccda4e1d6f9a63b689167887f7d329cdc5dffa (diff)
parent8230bf0a2f39f0849b670d26067207c45edcca1a (diff)
Merge pull request #11026 from hpvb/fix-assign-in-if
Remove assignment and declarations in if statements
Diffstat (limited to 'scene/3d/interpolated_camera.cpp')
-rw-r--r--scene/3d/interpolated_camera.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/3d/interpolated_camera.cpp b/scene/3d/interpolated_camera.cpp
index 157ae42571..0f281b694d 100644
--- a/scene/3d/interpolated_camera.cpp
+++ b/scene/3d/interpolated_camera.cpp
@@ -55,8 +55,8 @@ void InterpolatedCamera::_notification(int p_what) {
Transform local_transform = get_global_transform();
local_transform = local_transform.interpolate_with(target_xform, delta);
set_global_transform(local_transform);
-
- if (Camera *cam = Object::cast_to<Camera>(node)) {
+ Camera *cam = Object::cast_to<Camera>(node);
+ if (cam) {
if (cam->get_projection() == get_projection()) {