From 5e1ae4e72d73eaf89f0e944946ccbbfa4cdd6c0b Mon Sep 17 00:00:00 2001 From: Syres916 <46537884+Syres916@users.noreply.github.com> Date: Sat, 17 Jul 2021 21:52:30 +0100 Subject: [PATCH 1/3] [Draft] gui_utils Minor bugfix on change to... ...Draft Wb with grid enabled. Please backport to 0.19 branch, see discussion https://forum.freecadweb.org/viewtopic.php?f=3&t=60251 --- src/Mod/Draft/draftutils/gui_utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Mod/Draft/draftutils/gui_utils.py b/src/Mod/Draft/draftutils/gui_utils.py index 2e731fa7d6..54bf0b3383 100644 --- a/src/Mod/Draft/draftutils/gui_utils.py +++ b/src/Mod/Draft/draftutils/gui_utils.py @@ -64,6 +64,7 @@ def get_3d_view(): Return `None` if the graphical interface is not available. """ if App.GuiUp: + import FreeCADGui as Gui if Gui.ActiveDocument: v = Gui.ActiveDocument.ActiveView if "View3DInventor" in str(type(v)): From a049b9118be81246b754c8cd963e434ce8a6576b Mon Sep 17 00:00:00 2001 From: Syres916 <46537884+Syres916@users.noreply.github.com> Date: Sun, 18 Jul 2021 19:52:31 +0100 Subject: [PATCH 2/3] [Draft] gui_utils Coin import addition --- src/Mod/Draft/draftutils/gui_utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Mod/Draft/draftutils/gui_utils.py b/src/Mod/Draft/draftutils/gui_utils.py index 54bf0b3383..0d37613a11 100644 --- a/src/Mod/Draft/draftutils/gui_utils.py +++ b/src/Mod/Draft/draftutils/gui_utils.py @@ -65,6 +65,7 @@ def get_3d_view(): """ if App.GuiUp: import FreeCADGui as Gui + from pivy import coin if Gui.ActiveDocument: v = Gui.ActiveDocument.ActiveView if "View3DInventor" in str(type(v)): From f76c9926dac05d81cc36a8e5e630e45c5fe3c687 Mon Sep 17 00:00:00 2001 From: Syres916 <46537884+Syres916@users.noreply.github.com> Date: Mon, 2 Aug 2021 15:19:22 +0100 Subject: [PATCH 3/3] [Draft] gui_utils Added FIXME comment to assist.. ... revisiting in future --- src/Mod/Draft/draftutils/gui_utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Mod/Draft/draftutils/gui_utils.py b/src/Mod/Draft/draftutils/gui_utils.py index 0d37613a11..cb5b5e54c3 100644 --- a/src/Mod/Draft/draftutils/gui_utils.py +++ b/src/Mod/Draft/draftutils/gui_utils.py @@ -64,6 +64,8 @@ def get_3d_view(): Return `None` if the graphical interface is not available. """ if App.GuiUp: + # FIXME The following two imports were added as part of PR4926 + # Also see discussion https://forum.freecadweb.org/viewtopic.php?f=3&t=60251 import FreeCADGui as Gui from pivy import coin if Gui.ActiveDocument: