summaryrefslogtreecommitdiff
path: root/src/content_cao.cpp
diff options
context:
space:
mode:
authorPerttu Ahola <celeron55@gmail.com>2011-12-04 00:45:12 +0200
committerPerttu Ahola <celeron55@gmail.com>2011-12-04 00:45:12 +0200
commit3a689a5c4faa8729ee3f94f4528e196aa5ef34a7 (patch)
treeebb70321489e20376271ba14f5d1af1f2c60fe94 /src/content_cao.cpp
parent44e36d9aaddb93b0ec0e38561c745a1182536752 (diff)
downloadminetest-3a689a5c4faa8729ee3f94f4528e196aa5ef34a7.tar.gz
minetest-3a689a5c4faa8729ee3f94f4528e196aa5ef34a7.tar.bz2
minetest-3a689a5c4faa8729ee3f94f4528e196aa5ef34a7.zip
Don't initialize ItemCAOs with stick.png
Diffstat (limited to 'src/content_cao.cpp')
-rw-r--r--src/content_cao.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp
index 0531fe489..7563cfcc6 100644
--- a/src/content_cao.cpp
+++ b/src/content_cao.cpp
@@ -576,9 +576,8 @@ void ItemCAO::addToScene(scene::ISceneManager *smgr, ITextureSource *tsrc,
// Set material
buf->getMaterial().setFlag(video::EMF_LIGHTING, false);
buf->getMaterial().setFlag(video::EMF_BACK_FACE_CULLING, false);
- //buf->getMaterial().setTexture(0, NULL);
- // Initialize with the stick texture
- buf->getMaterial().setTexture(0, tsrc->getTextureRaw("stick.png"));
+ // Initialize with a generated placeholder texture
+ buf->getMaterial().setTexture(0, tsrc->getTextureRaw(""));
buf->getMaterial().setFlag(video::EMF_BILINEAR_FILTER, false);
buf->getMaterial().setFlag(video::EMF_FOG_ENABLE, true);
buf->getMaterial().MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;