summaryrefslogtreecommitdiff
path: root/scene
diff options
context:
space:
mode:
authorvolzhs <volzhs@gmail.com>2017-07-03 00:27:27 +0900
committervolzhs <volzhs@gmail.com>2017-07-03 00:27:27 +0900
commit6ed2b0eabcae025117118e8db40fe045620fc9be (patch)
treeb4face1192d371443153bce9fe8056d068ec2f2c /scene
parentbb6e73f9c155c0340fa4a152fa60a146f0ae744f (diff)
Update visibility icon properly
Diffstat (limited to 'scene')
-rw-r--r--scene/3d/spatial.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/scene/3d/spatial.cpp b/scene/3d/spatial.cpp
index 3debbf02c3..20c2cc1eb5 100644
--- a/scene/3d/spatial.cpp
+++ b/scene/3d/spatial.cpp
@@ -541,10 +541,7 @@ void Spatial::show() {
if (!is_inside_tree())
return;
- if (!data.parent || is_visible_in_tree()) {
-
- _propagate_visibility_changed();
- }
+ _propagate_visibility_changed();
}
void Spatial::hide() {
@@ -552,14 +549,14 @@ void Spatial::hide() {
if (!data.visible)
return;
- bool was_visible = is_visible_in_tree();
data.visible = false;
- if (!data.parent || was_visible) {
+ if (!is_inside_tree())
+ return;
- _propagate_visibility_changed();
- }
+ _propagate_visibility_changed();
}
+
bool Spatial::is_visible_in_tree() const {
const Spatial *s = this;