diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2017-06-26 22:47:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-26 22:47:11 +0200 |
commit | f7b77e5b76639dbc2e7a770cc57b64fc02a1e075 (patch) | |
tree | 697fa698482091279b49847a98b0ba1048e6d995 /editor/plugins | |
parent | 8ca690bbd707dfe56f0c8bc63bba57837664193e (diff) | |
parent | 2edb082c7eb85fa1175771ad298f8a8169bc267a (diff) |
Merge pull request #9318 from bojidar-bg/readd-normal-tilemap
Add normal map to tilemaps and tilesets
Diffstat (limited to 'editor/plugins')
-rw-r--r-- | editor/plugins/tile_set_editor_plugin.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp index 14b25681b7..aa579ae45c 100644 --- a/editor/plugins/tile_set_editor_plugin.cpp +++ b/editor/plugins/tile_set_editor_plugin.cpp @@ -53,6 +53,7 @@ void TileSetEditor::_import_node(Node *p_node, Ref<TileSet> p_library) { Sprite *mi = child->cast_to<Sprite>(); Ref<Texture> texture = mi->get_texture(); + Ref<Texture> normal_map = mi->get_normal_map(); Ref<ShaderMaterial> material = mi->get_material(); if (texture.is_null()) @@ -67,6 +68,7 @@ void TileSetEditor::_import_node(Node *p_node, Ref<TileSet> p_library) { } p_library->tile_set_texture(id, texture); + p_library->tile_set_normal_map(id, normal_map); p_library->tile_set_material(id, material); p_library->tile_set_modulate(id, mi->get_modulate()); |