diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-11-15 19:58:36 +0200 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:44 +0200 |
commit | eed727c61b51f46f6d172c56ecd26a3b1752d449 (patch) | |
tree | 0c6efe4379ace6c20f76267cc40ba01a69ef9ecc /src/tile.cpp | |
parent | 89e7bacd991060fe6cdada6bf8112f9f20c3e310 (diff) | |
download | minetest-eed727c61b51f46f6d172c56ecd26a3b1752d449.tar.gz minetest-eed727c61b51f46f6d172c56ecd26a3b1752d449.tar.bz2 minetest-eed727c61b51f46f6d172c56ecd26a3b1752d449.zip |
Completely generalized mesh generation; ContentFeatures serialization
Diffstat (limited to 'src/tile.cpp')
-rw-r--r-- | src/tile.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/tile.cpp b/src/tile.cpp index b0e1fbf5a..f57abfbb8 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -182,12 +182,15 @@ struct SourceAtlasPointer class SourceImageCache { public: - void insert(const std::string &name, video::IImage *img) + void insert(const std::string &name, video::IImage *img, + bool do_overwrite) { assert(img); core::map<std::string, video::IImage*>::Node *n; n = m_images.find(name); if(n){ + if(!do_overwrite) + return; video::IImage *oldimg = n->getValue(); if(oldimg) oldimg->drop(); @@ -720,7 +723,7 @@ void TextureSource::insertSourceImage(const std::string &name, video::IImage *im assert(get_current_thread_id() == m_main_thread); - m_sourcecache.insert(name, img); + m_sourcecache.insert(name, img, false); #if 0 JMutexAutoLock lock(m_atlaspointer_cache_mutex); |