From 0159cecd6950a11853c243d09867ad20d8ac5cec Mon Sep 17 00:00:00 2001
From: Franklin Sobrinho
Date: Mon, 22 Jun 2015 11:10:13 -0300
Subject: Small fixes for Grid/Tile map editor palette

---
 tools/editor/plugins/tile_map_editor_plugin.cpp | 27 +++++++++++++------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'tools/editor')

diff --git a/tools/editor/plugins/tile_map_editor_plugin.cpp b/tools/editor/plugins/tile_map_editor_plugin.cpp
index 7d5f2669a..017a26441 100644
--- a/tools/editor/plugins/tile_map_editor_plugin.cpp
+++ b/tools/editor/plugins/tile_map_editor_plugin.cpp
@@ -79,11 +79,11 @@ int TileMapEditor::get_selected_tile() const {
 
 void TileMapEditor::set_selected_tile(int p_tile) {
 	for (int i = 0; i < palette->get_item_count(); i++) {
-	    if (palette->get_item_metadata(i).operator int() == p_tile) {
-	        palette->select(i,true);
-	        palette->ensure_current_is_visible();
-	        break;
-	    }
+		if (palette->get_item_metadata(i).operator int() == p_tile) {
+			palette->select(i,true);
+			palette->ensure_current_is_visible();
+			break;
+		}
 	}
 }
 
@@ -170,16 +170,16 @@ void TileMapEditor::_update_palette() {
 		if (tex.is_valid()) {
 			Rect2 region = tileset->tile_get_region(E->get());
 
-			if (region==Rect2()) {
-			    continue;
-			}
-
-			Image data = VS::get_singleton()->texture_get_data(tex->get_rid());
+			if (!region.has_no_area()) {
+				Image data = VS::get_singleton()->texture_get_data(tex->get_rid());
 
-			Ref<ImageTexture> img = memnew( ImageTexture );
-			img->create_from_image(data.get_rect(region));
+				Ref<ImageTexture> img = memnew( ImageTexture );
+				img->create_from_image(data.get_rect(region));
 
-			palette->set_item_icon(palette->get_item_count()-1, img);
+				palette->set_item_icon(palette->get_item_count()-1, img);
+			} else {
+				palette->set_item_icon(palette->get_item_count()-1,tex);
+			}
 		}
 
 		if (tileset->tile_get_name(E->get())!="") {
@@ -187,6 +187,7 @@ void TileMapEditor::_update_palette() {
 		} else {
 			palette->set_item_text(palette->get_item_count()-1, "#"+itos(E->get()));
 		}
+
 		palette->set_item_metadata(palette->get_item_count()-1, E->get());
 	}
 }
-- 
cgit v1.2.3-70-g09d2