nicolas/nodeslicer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

up

Browse source
This commit is contained in:
Nicolas Predella 2026-08-26 12:35:32 +03:00
commit 77323d29db
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
infra/_3mf_writer/_3mf.py
View file

@ -7,7 +7,14 @@ import xml.etree.ElementTree as ET
from datetime import date from datetime import date
from typing import Any from typing import Any
<<<<<<< HEAD
from ..blender.blender_mesh_capture import SlicingGroup, SlicingCollection from ..blender.blender_mesh_capture import SlicingGroup, SlicingCollection
=======
try:
from ..blender.blender_mesh_capture import SlicingGroup, SlicingCollection
except ImportError:
from ..infra.blender_mesh_capture import SlicingGroup, SlicingCollection
>>>>>>> 9d282dee016bdbc10e4529120ee4e3faedbe6685
script_dir = os.path.dirname(os.path.abspath(__file__)) script_dir = os.path.dirname(os.path.abspath(__file__))