diff options
| author | reduz <reduzio@gmail.com> | 2015-12-28 09:39:12 -0300 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2015-12-28 09:39:12 -0300 |
| commit | 5d47e42eb69fcc0d1f502f9b5e72e064cb22d34e (patch) | |
| tree | 68bdbda14e3a9c6ad23b96d0f5d8f2d49b4872a1 /scene/2d/parallax_background.cpp | |
| parent | fcd4b1a421e9c3ed25201cfd428cfbe789b12204 (diff) | |
| parent | bfbde4dfd11be8728be4bb88d8bc109acb19ccfd (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'scene/2d/parallax_background.cpp')
| -rw-r--r-- | scene/2d/parallax_background.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scene/2d/parallax_background.cpp b/scene/2d/parallax_background.cpp index 8bb4eb55ba..fc38a55cdf 100644 --- a/scene/2d/parallax_background.cpp +++ b/scene/2d/parallax_background.cpp @@ -193,7 +193,7 @@ void ParallaxBackground::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_limit_begin"),&ParallaxBackground::get_limit_begin); ObjectTypeDB::bind_method(_MD("set_limit_end","ofs"),&ParallaxBackground::set_limit_end); ObjectTypeDB::bind_method(_MD("get_limit_end"),&ParallaxBackground::get_limit_end); - ObjectTypeDB::bind_method(_MD("set_ignore_camera_zoom"), &ParallaxBackground::set_ignore_camera_zoom); + ObjectTypeDB::bind_method(_MD("set_ignore_camera_zoom","ignore"), &ParallaxBackground::set_ignore_camera_zoom); ObjectTypeDB::bind_method(_MD("is_ignore_camera_zoom"), &ParallaxBackground::is_ignore_camera_zoom); |