aboutsummaryrefslogtreecommitdiff
path: root/scene/2d/canvas_item.cpp
diff options
context:
space:
mode:
authorRémi Verschelde2016-03-09 00:14:08 +0100
committerRémi Verschelde2016-03-09 00:14:08 +0100
commite46e43d2aaa6339a1675eb989f41885e745bf5c3 (patch)
treecf91f2869ff8f058c6682569fb31e22e5ee736ad /scene/2d/canvas_item.cpp
parent1dad6eca812e5c2e313b54265114de8a1d73d999 (diff)
parent4a4f2479146aa33e235ed57cde311efda68d3c8f (diff)
downloadgodot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.tar.gz
godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.tar.zst
godot-e46e43d2aaa6339a1675eb989f41885e745bf5c3.zip
Merge pull request #3928 from Marqin/whitespace
remove trailing whitespace - sorry for the broken PRs, please rebase :)
Diffstat (limited to '')
-rw-r--r--scene/2d/canvas_item.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp
index 316097fbc..483feea5c 100644
--- a/scene/2d/canvas_item.cpp
+++ b/scene/2d/canvas_item.cpp
@@ -233,7 +233,7 @@ bool CanvasItem::is_visible() const {
const CanvasItem *p=this;
- while(p) {
+ while(p) {
if (p->hidden)
return false;
p=p->get_parent_item();
@@ -310,11 +310,11 @@ void CanvasItem::hide() {
}
void CanvasItem::set_hidden(bool p_hidden) {
-
+
if (hidden == p_hidden) {
return;
}
-
+
_set_visible_(!p_hidden);
}
@@ -1209,7 +1209,7 @@ CanvasItem::CanvasItem() : xform_change(this) {
pending_update=false;
opacity=1;
self_opacity=1;
- toplevel=false;
+ toplevel=false;
pending_children_sort=false;
first_draw=false;
blend_mode=BLEND_MODE_MIX;