diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-09-09 18:52:47 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-09-09 18:52:47 -0300 |
| commit | 4e8dcc8938928864aaab2c70e594dd1f35a40167 (patch) | |
| tree | d35c176121eb8b4d1446fb9a888550b107e883d5 /main | |
| parent | 97413746173b4f872e8c72eba0e58d7092a93269 (diff) | |
| parent | e3e93da6b94cdf14e9a6f466cf5f50a857166928 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/main/main.cpp b/main/main.cpp index 452e95660f..c9ccf8cd7a 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -335,7 +335,6 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas init_custom_pos=Point2(x,y); init_use_custom_pos=true; - force_res=true; N=I->next()->next(); } else { |