summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvolzhs <volzhs@gmail.com>2017-12-25 01:31:28 +0900
committervolzhs <volzhs@gmail.com>2017-12-25 02:43:37 +0900
commitff68b80df7e08a2fcae3b3ace56be1d9bee73235 (patch)
treed79ad076f9fef46dd627824a76456fdf3dd16e13
parentd6a88cdc4134c5938bc8c6a291d6f087ad75da07 (diff)
Fix error if scene has Camera at saving scene
-rw-r--r--scene/3d/camera.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/scene/3d/camera.cpp b/scene/3d/camera.cpp
index 72c0b979af..bd71c2fc18 100644
--- a/scene/3d/camera.cpp
+++ b/scene/3d/camera.cpp
@@ -70,6 +70,9 @@ void Camera::_validate_property(PropertyInfo &p_property) const {
void Camera::_update_camera() {
+ if (!is_inside_tree())
+ return;
+
Transform tr = get_camera_transform();
tr.origin += tr.basis.get_axis(1) * v_offset;
tr.origin += tr.basis.get_axis(0) * h_offset;
@@ -81,7 +84,7 @@ void Camera::_update_camera() {
get_viewport()->_camera_transform_changed_notify();
*/
- if (!is_inside_tree() || get_tree()->is_node_being_edited(this) || !is_current())
+ if (get_tree()->is_node_being_edited(this) || !is_current())
return;
get_viewport()->_camera_transform_changed_notify();