Changes needed wrt how we build Savitar with Sip 6.

part of CURA-7924
This commit is contained in:
Remco Burema 2022-02-25 14:31:51 +01:00
parent 08c49c6c13
commit 7511ac843e
2 changed files with 7 additions and 7 deletions

View file

@ -5,7 +5,7 @@ import os.path
import zipfile
from typing import List, Optional, Union, TYPE_CHECKING, cast
import Savitar
import pySavitar
import numpy
from UM.Logger import Logger
@ -90,7 +90,7 @@ class ThreeMFReader(MeshReader):
return temp_mat
def _convertSavitarNodeToUMNode(self, savitar_node: Savitar.SceneNode, file_name: str = "") -> Optional[SceneNode]:
def _convertSavitarNodeToUMNode(self, savitar_node: pySavitar.SceneNode, file_name: str = "") -> Optional[SceneNode]:
"""Convenience function that converts a SceneNode object (as obtained from libSavitar) to a scene node.
:returns: Scene node.
@ -206,7 +206,7 @@ class ThreeMFReader(MeshReader):
try:
archive = zipfile.ZipFile(file_name, "r")
self._base_name = os.path.basename(file_name)
parser = Savitar.ThreeMFParser()
parser = pySavitar.ThreeMFParser()
scene_3mf = parser.parse(archive.open("3D/3dmodel.model").read())
self._unit = scene_3mf.getUnit()