Merge remote-tracking branch 'jn/random-fixes'

4 files changed, 21 insertions, 15 deletions

diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua
index 3f4a8175e..7f63d9a7c 100644
--- a/data/mods/default/init.lua
+++ b/data/mods/default/init.lua
@@ -1650,7 +1650,7 @@ minetest.add_to_creative_inventory('default:cactus')
 minetest.add_to_creative_inventory('default:papyrus')
 minetest.add_to_creative_inventory('default:bookshelf')
 minetest.add_to_creative_inventory('default:glass')
-minetest.add_to_creative_inventory('default:fence')
+minetest.add_to_creative_inventory('default:fence_wood')
 minetest.add_to_creative_inventory('default:rail')
 minetest.add_to_creative_inventory('default:mese')
 minetest.add_to_creative_inventory('default:chest')
@@ -1781,6 +1781,9 @@ local function handle_give_command(cmd, giver, receiver, stackstring)
 	else
 		partiality = "partially "
 	end
+	-- The actual item stack string may be different from what the "giver"
+	-- entered (e.g. big numbers are always interpreted as 2^16-1).
+	stackstring = itemstack:to_string()
 	if giver == receiver then
 		minetest.chat_send_player(giver, '"'..stackstring
 			..'" '..partiality..'added to inventory.');
diff --git a/src/itemdef.cpp b/src/itemdef.cpp
index aa888bbdf..22ca9f088 100644
--- a/src/itemdef.cpp
+++ b/src/itemdef.cpp
@@ -417,7 +417,13 @@ public:
 						light_position,
 						light_color,
 						light_radius);
-					// Note: might have returned NULL
+
+					// render-to-target didn't work
+					if(def->inventory_texture == NULL)
+					{
+						def->inventory_texture =
+							tsrc->getTextureRaw(f.tname_tiles[0]);
+					}
 				}
 
 				/*
diff --git a/src/mesh.cpp b/src/mesh.cpp
index 5afb4af59..d0d8b0a6e 100644
--- a/src/mesh.cpp
+++ b/src/mesh.cpp
@@ -422,8 +422,13 @@ video::ITexture *generateTextureFromMesh(scene::IMesh *mesh,
 	video::IVideoDriver *driver = device->getVideoDriver();
 	if(driver->queryFeature(video::EVDF_RENDER_TO_TARGET) == false)
 	{
-		errorstream<<"generateTextureFromMesh(): EVDF_RENDER_TO_TARGET"
-				" not supported."<<std::endl;
+		static bool warned = false;
+		if(!warned)
+		{
+			errorstream<<"generateTextureFromMesh(): EVDF_RENDER_TO_TARGET"
+					" not supported."<<std::endl;
+			warned = true;
+		}
 		return NULL;
 	}
 
diff --git a/src/tile.cpp b/src/tile.cpp
index bc4c49cb1..c39a65511 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -1023,15 +1023,9 @@ video::IImage* generate_image_from_scratch(std::string name,
 	char separator = '^';
 
 	// Find last meta separator in name
-	s32 last_separator_position = -1;
-	for(s32 i=name.size()-1; i>=0; i--)
-	{
-		if(name[i] == separator)
-		{
-			last_separator_position = i;
-			break;
-		}
-	}
+	s32 last_separator_position = name.find_last_of(separator);
+	//if(last_separator_position == std::npos)
+	//	last_separator_position = -1;
 
 	/*infostream<<"generate_image_from_scratch(): "
 			<<"last_separator_position="<<last_separator_position
@@ -1489,8 +1483,6 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg,
 			
 			if(rtt == NULL)
 			{
-				errorstream<<"generate_image(): render to texture failed."
-						" Creating fallback image"<<std::endl;
 				baseimg = generate_image_from_scratch(
 						imagename_top, device, sourcecache);
 				return true;