From 84b91027a04333f75fbe8b63523417e393b9ea54 Mon Sep 17 00:00:00 2001
From: Matthias Hochsteger <matthias.hochsteger@tuwien.ac.at>
Date: Mon, 19 Oct 2015 13:49:09 +0200
Subject: [PATCH] fix geom2d/stl init

---
 ng/ng.tcl      | 4 ++--
 ng/ngpkg.cpp   | 4 ++--
 ng/stlgeom.tcl | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ng/ng.tcl b/ng/ng.tcl
index 49af771e..8f780814 100644
--- a/ng/ng.tcl
+++ b/ng/ng.tcl
@@ -91,10 +91,10 @@ catch {
 }
 
 
-if { [catch { load libgeom2dvis[info sharedlibextension] Ng_Geom2d } result ] } {
+# if { [catch { load libgeom2dvis[info sharedlibextension] Ng_Geom2d } result ] } {
 #    puts "cannot load 2d meshing module" 
 #    puts "error: $result"
-}
+# }
 
 catch { source ${ngdir}/csgeom.tcl }
 catch { source ${ngdir}/stlgeom.tcl }
diff --git a/ng/ngpkg.cpp b/ng/ngpkg.cpp
index b472b004..1cb85aa0 100644
--- a/ng/ngpkg.cpp
+++ b/ng/ngpkg.cpp
@@ -3159,8 +3159,8 @@ void PlayAnimFile(const char* name, int speed, int maxcnt)
   extern "C" int Ng_CSG_Init (Tcl_Interp * interp);
 
   extern "C" int Ng_stl_Init (Tcl_Interp * interp);
-#ifdef _MSC_VER
   extern "C" int Ng_geom2d_Init (Tcl_Interp * interp);
+#ifdef _MSC_VER
   #ifdef OCCGEOMETRY
     extern "C" int Ng_occ_Init (Tcl_Interp * interp);
   #endif
@@ -3183,8 +3183,8 @@ void PlayAnimFile(const char* name, int speed, int maxcnt)
 
     Ng_CSG_Init(interp);
     Ng_stl_Init(interp);
-#ifdef _MSC_VER
     Ng_geom2d_Init (interp);
+#ifdef _MSC_VER
 #ifdef OCCGEOMETRY
     Ng_occ_Init (interp);
 #endif
diff --git a/ng/stlgeom.tcl b/ng/stlgeom.tcl
index bdf28303..bee8ef2a 100644
--- a/ng/stlgeom.tcl
+++ b/ng/stlgeom.tcl
@@ -1,7 +1,7 @@
-if { [catch { load libstlvis[info sharedlibextension] Ng_STL } result ] } {
+#if { [catch { load libstlvis[info sharedlibextension] Ng_STL } result ] } {
 #    puts "cannot load stl" 
 #    puts "error: $result"
-}
+#}
 
 
 .ngmenu.geometry add separator