Eliminated NullPointerException in vtkGizmo.deattachActors().

[simantics/3d.git] / org.simantics.g3d.vtk / src / org / simantics / g3d / vtk / swt / InteractiveVtkComposite.java

diff --git a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/InteractiveVtkComposite.java b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/InteractiveVtkComposite.java
index b8f9ff0c459ded51c4e38679d8c5d595cd1e0b21..da984c086650c2c4578b7593175e44a4c5a9cfb1 100644 (file)
--- a/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/InteractiveVtkComposite.java
+++ b/org.simantics.g3d.vtk/src/org/simantics/g3d/vtk/swt/InteractiveVtkComposite.java
@@ -1,17 +1,13 @@
 package org.simantics.g3d.vtk.swt;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
-import javax.vecmath.Vector3d;
-
+import org.eclipse.core.runtime.Platform;
 import org.eclipse.swt.widgets.Composite;
-import org.simantics.g3d.math.Ray;
 import org.simantics.g3d.scenegraph.RenderListener;
 import org.simantics.g3d.vtk.action.vtkAction;
 import org.simantics.g3d.vtk.common.VtkView;
-import org.simantics.g3d.vtk.utils.vtkUtil;
 import org.simantics.utils.threads.IThreadWorkQueue;
 import org.simantics.utils.threads.SWTThread;
 import org.simantics.utils.threads.ThreadUtils;
@@ -23,7 +19,7 @@ import vtk.vtkAreaPicker;
 import vtk.vtkAssemblyNode;
 import vtk.vtkAssemblyPath;
 import vtk.vtkCellPicker;
-import vtk.vtkCoordinate;
+import vtk.vtkObject;
 import vtk.vtkObjectBase;
 import vtk.vtkPointPicker;
 import vtk.vtkProp;
@@ -41,8 +37,11 @@ public class InteractiveVtkComposite extends vtkSwtComponent implements VtkView{
        public InteractiveVtkComposite(Composite parentComposite) {
                super(parentComposite);
                this.parentComposite = parentComposite;
-               
-               // TODO Auto-generated constructor stub
+
+               if (!Platform.inDevelopmentMode()) {
+                       // This is actually a static method in C++
+                       new vtkObject().GlobalWarningDisplayOff();
+               }
        }
        
        private boolean updating = false;
@@ -183,10 +182,6 @@ public class InteractiveVtkComposite extends vtkSwtComponent implements VtkView{
        
        public void lock() {
                getVTKLock().lock();
-               if (getComponent().getContext() != null && !getComponent().getContext().isCurrent()) {
-                       int ret = getComponent().getContext().makeCurrent();
-//                     System.out.println("Make current2 " + ret);
-               }
        }
        
        public void unlock() {