Merge branch 'master' of git://github.com/FreeCAD/FreeCAD

src/Mod/Arch/ArchComponent.py

@@ -240,7 +240,7 @@ class ComponentTaskPanel:
         if it:
             mod = None
             for a in self.attribs:
-                if it == getattr(self,"tree"+a):
+                if it.text(0) == getattr(self,"tree"+a).text(0):
                     mod = a
             for o in FreeCADGui.Selection.getSelection():
                 addToComponent(self.obj,o,mod)

src/Mod/Draft/Draft.py

@@ -592,7 +592,7 @@ def getMovableChildren(objectslist,recursive=False):
             children = obj.OutList
             if  hasattr(obj,"Proxy"):
                 if obj.Proxy:
-                    if hasattr(obj.Proxy,"getSiblings"):
+                    if hasattr(obj.Proxy,"getSiblings") and not(getType(obj) in ["Window"]):
                         children.extend(obj.Proxy.getSiblings(obj))
             for child in children:
                 if hasattr(child,"MoveWithHost"):

src/Mod/Draft/importDXF.py

@@ -1320,7 +1320,8 @@ def processdxf(document,filename,getShapes=False):
                             newob.ViewObject.FontSize = draftui.fontsize
                         else:
                             st = rawValue(dim,3)
-                            newob.ViewObject.FontSize = float(getdimheight(st))*TEXTSCALING
+                            size = getdimheight(st) or 1
+                            newob.ViewObject.FontSize = float(size)*TEXTSCALING
     else:
         FreeCAD.Console.PrintMessage("skipping dimensions...\n")