summaryrefslogtreecommitdiff
path: root/src/itemdef.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2012-02-28 21:47:15 +0200
committerPerttu Ahola <celeron55@gmail.com>2012-02-28 21:47:15 +0200
commit14a71590c361b5417938c79e53879bbb931949f3 (patch)
tree8b804b44d5ff12e1af9aeb6b2491f929ac22cbe9 /src/itemdef.cpp
parenta5f6d65c3788da7811c5655110cc6deb95f20999 (diff)
parent806f10524f6a2cdcc1f15e12b9991ad726876d27 (diff)
downloadminetest-14a71590c361b5417938c79e53879bbb931949f3.tar.gz
minetest-14a71590c361b5417938c79e53879bbb931949f3.tar.bz2
minetest-14a71590c361b5417938c79e53879bbb931949f3.zip
Merge remote-tracking branch 'jn/random-fixes'
Diffstat (limited to 'src/itemdef.cpp')
-rw-r--r--src/itemdef.cpp8
1 files changed, 7 insertions, 1 deletions
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]);
+ }
}
/*