From eed727c61b51f46f6d172c56ecd26a3b1752d449 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Tue, 15 Nov 2011 19:58:36 +0200 Subject: Completely generalized mesh generation; ContentFeatures serialization --- src/tile.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/tile.cpp') 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::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); -- cgit v1.2.3