summaryrefslogtreecommitdiff
path: root/scene/2d
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2016-06-24 21:16:20 +0200
committerGitHub <noreply@github.com>2016-06-24 21:16:20 +0200
commitd52fa2e0ebc5eec796d243286494afae55d3a31a (patch)
tree393cafbae2e727bebe9ae3c4be9a40568789780a /scene/2d
parent06c6516604696c294df2e374ba8433efee54912c (diff)
parent6776fa63de4d96f043c1e970ee366a865d46da27 (diff)
Merge pull request #5380 from vnen/string-canvasitem-docs
Documentation for String and CanvasItem
Diffstat (limited to 'scene/2d')
-rw-r--r--scene/2d/canvas_item.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp
index eb37634b24..976a5c4f1e 100644
--- a/scene/2d/canvas_item.cpp
+++ b/scene/2d/canvas_item.cpp
@@ -1023,7 +1023,7 @@ void CanvasItem::_bind_methods() {
ObjectTypeDB::bind_method(_MD("_is_visible_"),&CanvasItem::_is_visible_);
ObjectTypeDB::bind_method(_MD("edit_set_state","state"),&CanvasItem::edit_set_state);
- ObjectTypeDB::bind_method(_MD("edit_get"),&CanvasItem::edit_get_state);
+ ObjectTypeDB::bind_method(_MD("edit_get_state:Variant"),&CanvasItem::edit_get_state);
ObjectTypeDB::bind_method(_MD("edit_set_rect","rect"),&CanvasItem::edit_set_rect);
ObjectTypeDB::bind_method(_MD("edit_rotate","degrees"),&CanvasItem::edit_rotate);