From 78c29c7d5d83d9535efc874167ff89de54b1dc25 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Fri, 20 Jan 2012 18:17:37 -0200 Subject: [PATCH] Fixed bug #576 - Arch Collada importer --- src/Mod/Arch/InitGui.py | 8 ++++---- src/Mod/Arch/importDAE.py | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Mod/Arch/InitGui.py b/src/Mod/Arch/InitGui.py index 0d069b29b..75f85e3e2 100644 --- a/src/Mod/Arch/InitGui.py +++ b/src/Mod/Arch/InitGui.py @@ -81,10 +81,6 @@ class ArchWorkbench(Workbench): FreeCADGui.addIconPath(":/icons") FreeCADGui.addLanguagePath(":/translations") FreeCADGui.addPreferencePage(":/ui/archprefs-base.ui","Arch") - FreeCAD.addImportType("Industry Foundation Classes (*.ifc)","importIFC") - FreeCAD.addExportType("Wavefront OBJ - Arch module (*.obj)","importOBJ") - FreeCAD.addImportType("Collada (*.dae)","importDAE") - FreeCAD.addExportType("Collada (*.dae)","importDAE") Log ('Loading Arch module... done\n') def Activated(self): @@ -102,4 +98,8 @@ class ArchWorkbench(Workbench): return "Gui::PythonWorkbench" FreeCADGui.addWorkbench(ArchWorkbench) +FreeCAD.addImportType("Industry Foundation Classes (*.ifc)","importIFC") +FreeCAD.addExportType("Wavefront OBJ - Arch module (*.obj)","importOBJ") +FreeCAD.addImportType("Collada (*.dae)","importDAE") +FreeCAD.addExportType("Collada (*.dae)","importDAE") diff --git a/src/Mod/Arch/importDAE.py b/src/Mod/Arch/importDAE.py index 11aa527e1..92f9f52fa 100644 --- a/src/Mod/Arch/importDAE.py +++ b/src/Mod/Arch/importDAE.py @@ -31,6 +31,8 @@ DEBUG = True def checkCollada(): "checks if collada if available" + global collada + COLLADA = None try: import collada except: