TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix automerge failure

Browse Source
This commit is contained in:
rdb 2016-09-08 22:27:25 +02:00
parent b74905ca9c
commit 4d8a9aa3a1
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/gobj/texturePool.cxx
View File

@ -671,7 +671,7 @@ ns_load_2d_texture_array(const Filename &filename_pattern,
nassertr(tex != (Texture *)NULL, NULL); nassertr(tex != (Texture *)NULL, NULL);
tex->set_filename(filename_pattern); tex->set_filename(filename_pattern);
tex->set_fullpath(filename); tex->set_fullpath(filename);
tex->_texture_pool_key = filename; tex->_texture_pool_key = unique_filename;
{ {
MutexHolder holder(_lock); MutexHolder holder(_lock);
@ -772,7 +772,7 @@ ns_load_cube_map(const Filename &filename_pattern, bool read_mipmaps,
nassertr(tex != (Texture *)NULL, NULL); nassertr(tex != (Texture *)NULL, NULL);
tex->set_filename(filename_pattern); tex->set_filename(filename_pattern);
tex->set_fullpath(filename); tex->set_fullpath(filename);
tex->_texture_pool_key = unique_filename; tex->_texture_pool_key = filename;
{ {
MutexHolder holder(_lock); MutexHolder holder(_lock);