From 05dd30861fc3c80da82010d28985c12ec12140d3 Mon Sep 17 00:00:00 2001 From: Yorik van Havre Date: Tue, 24 Jan 2012 15:59:00 -0200 Subject: [PATCH] Fixes before merging Ship --- src/Mod/Arch/ArchAxis.py | 1 + src/Mod/Arch/ArchCommands.py | 1 + src/Mod/Draft/Draft.py | 1 + 3 files changed, 3 insertions(+) diff --git a/src/Mod/Arch/ArchAxis.py b/src/Mod/Arch/ArchAxis.py index 4ea4fa317..53b425b75 100644 --- a/src/Mod/Arch/ArchAxis.py +++ b/src/Mod/Arch/ArchAxis.py @@ -22,6 +22,7 @@ #*************************************************************************** import FreeCAD,FreeCADGui,Draft,math + from draftlibs import fcvec from FreeCAD import Vector from PyQt4 import QtCore, QtGui diff --git a/src/Mod/Arch/ArchCommands.py b/src/Mod/Arch/ArchCommands.py index a8b09f5e8..d05dd1346 100644 --- a/src/Mod/Arch/ArchCommands.py +++ b/src/Mod/Arch/ArchCommands.py @@ -138,6 +138,7 @@ def splitMesh(obj,mark=True): def meshToShape(obj,mark=True): '''meshToShape(object,[mark]): turns a mesh into a shape, joining coplanar facets. If mark is True (default), non-solid objects will be marked in red''' + name = obj.Name import Part,MeshPart from draftlibs import fcgeo diff --git a/src/Mod/Draft/Draft.py b/src/Mod/Draft/Draft.py index 7b03d5ebd..c7209ae7b 100644 --- a/src/Mod/Draft/Draft.py +++ b/src/Mod/Draft/Draft.py @@ -970,6 +970,7 @@ def draftify(objectslist,makeblock=False): wire. If makeblock is True, multiple objects will be grouped in a block''' from draftlibs import fcgeo import Part + if not isinstance(objectslist,list): objectslist = [objectslist] newobjlist = []