diff options
| author | Juan Linietsky | 2015-04-18 16:17:33 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-04-18 16:17:33 -0300 |
| commit | 4661a6e126f03efcb7b41196d2fca9c9564123c6 (patch) | |
| tree | 663af68e5a123d9f58afba400df72c850ccf448e /scene | |
| parent | fdaa2920eb21fff3320a17e9239e04dfadecdb00 (diff) | |
| download | godot-4661a6e126f03efcb7b41196d2fca9c9564123c6.tar.gz godot-4661a6e126f03efcb7b41196d2fca9c9564123c6.tar.zst godot-4661a6e126f03efcb7b41196d2fca9c9564123c6.zip | |
-try to avoid errors when path using ".." is present in script include, fixes #1703
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/2d/tile_map.cpp | 9 | ||||
| -rw-r--r-- | scene/2d/tile_map.h | 2 | ||||
| -rw-r--r-- | scene/gui/text_edit.cpp | 10 |
3 files changed, 5 insertions, 16 deletions
diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index bc2dfe101..bf1677ae6 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2015 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 */ @@ -348,8 +348,8 @@ void TileMap::_update_dirty_quadrants() { rect.pos=offset.floor(); rect.size=s; - rect.size.x+=fp_adjust; - rect.size.y+=fp_adjust; + /* rect.size.x+=fp_adjust; + rect.size.y+=fp_adjust;*/ if (c.flip_h) rect.size.x=-rect.size.x; @@ -1154,8 +1154,7 @@ TileMap::TileMap() { navigation=NULL; y_sort_mode=false; - fp_adjust=0.01; - fp_adjust=0.01; + fp_adjust=0.00001; tile_origin=TILE_ORIGIN_TOP_LEFT; } diff --git a/scene/2d/tile_map.h b/scene/2d/tile_map.h index 976ddfc5c..233529f01 100644 --- a/scene/2d/tile_map.h +++ b/scene/2d/tile_map.h @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2015 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 */ diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 0fa64f9b2..fb939d19b 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -26,16 +26,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -/*****f********************************************/ -/* text_edit.cpp */ -/*************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/*************************************************/ -/* Source code within this file is: */ -/* (c) 2007-2010 Juan Linietsky, Ariel Manzur */ -/* All Rights Reserved. */ -/*************************************************/ #include "text_edit.h" #include "os/keyboard.h" |