From 4d8a9aa3a149651303c2fe9354f0dec578d354a4 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Thu, 8 Sep 2016 22:27:25 +0200
Subject: [PATCH] Fix automerge failure

---
 panda/src/gobj/texturePool.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/panda/src/gobj/texturePool.cxx b/panda/src/gobj/texturePool.cxx
index 987e1947b5..e1e5e47faa 100644
--- a/panda/src/gobj/texturePool.cxx
+++ b/panda/src/gobj/texturePool.cxx
@@ -671,7 +671,7 @@ ns_load_2d_texture_array(const Filename &filename_pattern,
   nassertr(tex != (Texture *)NULL, NULL);
   tex->set_filename(filename_pattern);
   tex->set_fullpath(filename);
-  tex->_texture_pool_key = filename;
+  tex->_texture_pool_key = unique_filename;
 
   {
     MutexHolder holder(_lock);
@@ -772,7 +772,7 @@ ns_load_cube_map(const Filename &filename_pattern, bool read_mipmaps,
   nassertr(tex != (Texture *)NULL, NULL);
   tex->set_filename(filename_pattern);
   tex->set_fullpath(filename);
-  tex->_texture_pool_key = unique_filename;
+  tex->_texture_pool_key = filename;
 
   {
     MutexHolder holder(_lock);