From 47bd42caa8d3ab17fc88c853b2301f3a8f5f3a10 Mon Sep 17 00:00:00 2001 From: Adam Johnson Date: Sat, 25 Jun 2016 20:12:03 -0400 Subject: [PATCH] Relax restrictions on key names These rules made sense in 0.01 when we promoted modifier names. However, these have been disallowed for over a year now. These restrictions are sneaky and serve no purpose now. --- korman/exporter/manager.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/korman/exporter/manager.py b/korman/exporter/manager.py index 42ebce5..4541354 100644 --- a/korman/exporter/manager.py +++ b/korman/exporter/manager.py @@ -77,9 +77,12 @@ class ExportManager: # This is one of those "sanity" things to ensure we don't suddenly startpassing around the # key of an uninitialized object. if isinstance(pl, type(object)): - assert name or bl + assert name or bl or so if name is None: - name = bl.name + if bl is not None: + name = bl.name + else: + name = so.key.name pl = pl(name) self.mgr.AddObject(location, pl) @@ -173,14 +176,18 @@ class ExportManager: def find_key(self, pClass, bl=None, name=None, so=None): """Given a blender Object and a Plasma class, find (or create) an exported plKey""" - assert (bl or name) and (bl or so) + assert bl or so if so is None: location = self._pages[bl.plasma_object.page] else: location = so.key.location + if name is None: - name = bl.name + if bl is not None: + name = bl.name + else: + name = so.key.name index = plFactory.ClassIndex(pClass.__name__) for key in self.mgr.getKeys(location, index):