diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-17 19:34:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-17 19:34:01 +0100 |
| commit | f5b183d5252fd364c47c8453c7e5fdd90d723b10 (patch) | |
| tree | b7de5ce90f5b9ffd06ad268743f376279a3c8ed8 /editor/plugins | |
| parent | fd022cb156851659f635e16622d37c46266ca4a9 (diff) | |
| parent | c8d416d152003f1eb865df2c05a2024a9672e8bd (diff) | |
Merge pull request #14780 from vnen/tileset-editor-fix
Fix method not returning value in all paths (autotile editor)
Diffstat (limited to 'editor/plugins')
| -rw-r--r-- | editor/plugins/tile_set_editor_plugin.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp index ae726b69ef..5eb3435e24 100644 --- a/editor/plugins/tile_set_editor_plugin.cpp +++ b/editor/plugins/tile_set_editor_plugin.cpp @@ -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 { |