godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14780 from vnen/tileset-editor-fix 

Fix method not returning value in all paths (autotile editor)
This commit is contained in:
Rémi Verschelde 2017-12-17 19:34:01 +01:00 committed by GitHub
parent fd022cb156 c8d416d152
commit f5b183d525
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/plugins/tile_set_editor_plugin.cpp
View File

@ -1435,13 +1435,13 @@ bool AutotileEditorHelper::_get(const StringName &p_name, Variant &r_ret) const
return false;
String name = p_name.operator String();
bool v = false;
if (name == "bitmask_mode") {
r_ret = tile_set->get(String::num(autotile_editor->get_current_tile(), 0) + "/autotile/bitmask_mode");
r_ret = tile_set->get(String::num(autotile_editor->get_current_tile(), 0) + "/autotile/bitmask_mode", &v);
} else if (name.left(7) == "layout/") {
bool v;
r_ret = tile_set->get(String::num(autotile_editor->get_current_tile(), 0) + "/autotile" + name.right(6), &v);
return v;
}
return v;
}
void AutotileEditorHelper::_get_property_list(List<PropertyInfo> *p_list) const {