diff options
| author | Kostadin Damyanov <maxmight@gmail.com> | 2016-01-15 22:43:54 +0200 |
|---|---|---|
| committer | Kostadin Damyanov <maxmight@gmail.com> | 2016-01-15 22:43:54 +0200 |
| commit | 7998197ff17892a8127aa2fe53d13937763dee87 (patch) | |
| tree | 53c97bf9907a3225776340273e773a4d904cbb73 /scene/2d/camera_2d.cpp | |
| parent | 62574759ab16043b70f2da6e160072c353ba4148 (diff) | |
| parent | 3c6dd5749d445f082fc925a34cc0a26f8d342304 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'scene/2d/camera_2d.cpp')
| -rw-r--r-- | scene/2d/camera_2d.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index b7b99f935a..67c1733759 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -503,7 +503,7 @@ void Camera2D::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_camera_pos"),&Camera2D::get_camera_pos); ObjectTypeDB::bind_method(_MD("get_camera_screen_center"),&Camera2D::get_camera_screen_center); - ObjectTypeDB::bind_method(_MD("set_zoom"),&Camera2D::set_zoom); + ObjectTypeDB::bind_method(_MD("set_zoom","zoom"),&Camera2D::set_zoom); ObjectTypeDB::bind_method(_MD("get_zoom"),&Camera2D::get_zoom); |