Selaa lähdekoodia

Merge pull request #9614 from tschw/BlenderUUIDs

Blender: Let UUIDs be universally unique.
Mr.doob 9 vuotta sitten
vanhempi
commit
7b39cf1e44

+ 1 - 1
utils/exporters/blender/addons/io_three/exporter/base_classes.py

@@ -90,7 +90,7 @@ class BaseNode(BaseClass):
             self[constants.UUID] = utilities.id()
         else:
             self[constants.NAME] = node
-            self[constants.UUID] = utilities.id_from_name(node)
+            self[constants.UUID] = utilities.id()
 
         if isinstance(parent, BaseScene):
             scene = parent

+ 1 - 1
utils/exporters/blender/addons/io_three/exporter/scene.py

@@ -217,7 +217,7 @@ class Scene(base_classes.BaseScene):
             scene_name = constants.SCENE
         self[constants.OBJECT] = object_.Object(None, parent=self)
         self[constants.OBJECT][constants.TYPE] = constants.SCENE.title()
-        self[constants.UUID] = utilities.id_from_name(scene_name)
+        self[constants.UUID] = utilities.id()
 
         objects = []
         if self.options.get(constants.HIERARCHY, False):

+ 0 - 10
utils/exporters/blender/addons/io_three/exporter/utilities.py

@@ -46,16 +46,6 @@ def id():
     return str(uuid.uuid4()).upper()
 
 
-def id_from_name(name):
-    """Generate a UUID using a name as the namespace
-
-    :type name: str
-    :rtype: str
-
-    """
-    return str(uuid.uuid3(uuid.NAMESPACE_DNS, name)).upper()
-
-
 def rgb2int(rgb):
     """Convert a given rgb value to an integer