summaryrefslogtreecommitdiff
path: root/scene/resources/rectangle_shape_2d.cpp
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-10-13 01:19:32 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-10-13 01:19:32 -0300
commitb3cda43a0fb49e1cb9c8414077a23fa4b61ede38 (patch)
tree1fee133b2fbc6f2bade96cc9914a449cbb9dbe1e /scene/resources/rectangle_shape_2d.cpp
parent52e756752e1db9e4cf7c5bb7e92d44995ad674c4 (diff)
parentaad2bbdb6fb7c8217d7e75480b38e45f00cb3abd (diff)
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts: platform/windows/detect.py
Diffstat (limited to 'scene/resources/rectangle_shape_2d.cpp')
-rw-r--r--scene/resources/rectangle_shape_2d.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/resources/rectangle_shape_2d.cpp b/scene/resources/rectangle_shape_2d.cpp
index 9a32b013c1..7903d88736 100644
--- a/scene/resources/rectangle_shape_2d.cpp
+++ b/scene/resources/rectangle_shape_2d.cpp
@@ -57,7 +57,7 @@ void RectangleShape2D::draw(const RID& p_to_rid,const Color& p_color) {
Rect2 RectangleShape2D::get_rect() const {
- Rect2(-extents,extents*2.0);
+ return Rect2(-extents,extents*2.0);
}