godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Merge pull request #17166 from Noshyaar/tilemap2

Browse Source 
TileSet&TextureRegion: fix error when getting nonexistent tile
This commit is contained in:
Rémi Verschelde
2018-03-13 12:53:51 +01:00
committed by GitHub
parent fcd81c9627 86938a06aa
commit 8b629bbcbe
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
editor/plugins/tile_set_editor_plugin.cpp
View File

@@ -1826,6 +1826,8 @@ bool TileSetEditorHelper::_get(const StringName &p_name, Variant &r_ret) const {
if (selected_tile < 0 || tileset.is_null())
return false;
if (!tileset->has_tile(selected_tile))
return false;
String name = p_name.operator String();
bool v = false;
@@ -1850,6 +1852,7 @@ void TileSetEditorHelper::_get_property_list(List<PropertyInfo> *p_list) const {
TileSetEditorHelper::TileSetEditorHelper(TileSetEditor *p_tileset_editor) {
tileset_editor = p_tileset_editor;
selected_tile = -1;
}
void TileSetEditorPlugin::edit(Object *p_node) {