From ecc5bf277d5a36e2f6e5c110fe9c230637b7f287 Mon Sep 17 00:00:00 2001
From: Adam Johnson <AdamJohnso@gmail.com>
Date: Thu, 25 Jun 2015 17:31:06 -0400
Subject: [PATCH] Store Layer keys, not objects...

---
 korman/exporter/manager.py  | 4 ++--
 korman/exporter/material.py | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/korman/exporter/manager.py b/korman/exporter/manager.py
index 9d6ef91..4eda89d 100644
--- a/korman/exporter/manager.py
+++ b/korman/exporter/manager.py
@@ -200,13 +200,13 @@ class ExportManager:
             location = self._pages[bl.plasma_object.page]
         return self._nodes[location].key
 
-    def get_textures_page(self, layer):
+    def get_textures_page(self, key):
         """Gets the appropriate page for a texture for a given plLayer"""
         # The point of this is to account for per-page textures...
         if "Textures" in self._pages:
             return self._pages["Textures"]
         else:
-            return layer.key.location
+            return key.location
 
     def has_coordiface(self, bo):
         if bo.type in {"CAMERA", "EMPTY", "LAMP"}:
diff --git a/korman/exporter/material.py b/korman/exporter/material.py
index ef8c2a2..98ce223 100644
--- a/korman/exporter/material.py
+++ b/korman/exporter/material.py
@@ -352,10 +352,10 @@ class MaterialConverter:
             key = _Texture(texture=texture, use_alpha=has_alpha)
             if key not in self._pending:
                 print("            Stashing '{}' for conversion as '{}'".format(texture.image.name, str(key)))
-                self._pending[key] = [layer,]
+                self._pending[key] = [layer.key,]
             else:
                 print("            Found another user of '{}'".format(texture.image.name))
-                self._pending[key].append(layer)
+                self._pending[key].append(layer.key)
 
     def _export_texture_type_none(self, bo, hsgmat, layer, texture):
         # We'll allow this, just for sanity's sake...
@@ -431,7 +431,7 @@ class MaterialConverter:
 
             print("    Adding to Layer(s)")
             for layer in layers:
-                print("        {}".format(layer.key.name))
+                print("        {}".format(layer.name))
                 page = mgr.get_textures_page(layer) # Layer's page or Textures.prp
 
                 # If we haven't created this plMipmap in the page (either layer's page or Textures.prp),
@@ -447,7 +447,7 @@ class MaterialConverter:
                     pages[page] = mipmap
                 else:
                     mipmap = pages[page]
-                layer.texture = mipmap.key
+                layer.object.texture = mipmap.key
 
     def get_materials(self, bo):
         return self._obj2mat[bo]