X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.opencascade.vtk%2Fsrc%2Forg%2Fsimantics%2Fopencascade%2Fvtk%2FvtkSolidObject.java;h=f2501e95d7fe659965b9421608a30db44e9feee2;hb=86739231beb0535bde4abae49d2011e3a042810b;hp=fd2c0bb1d6bc6637d7e613d671457fdd5e855a25;hpb=9783d236a085584ac964444b365b566fd6a921ba;p=simantics%2F3d.git

diff --git a/org.simantics.opencascade.vtk/src/org/simantics/opencascade/vtk/vtkSolidObject.java b/org.simantics.opencascade.vtk/src/org/simantics/opencascade/vtk/vtkSolidObject.java
index fd2c0bb1..f2501e95 100644
--- a/org.simantics.opencascade.vtk/src/org/simantics/opencascade/vtk/vtkSolidObject.java
+++ b/org.simantics.opencascade.vtk/src/org/simantics/opencascade/vtk/vtkSolidObject.java
@@ -180,12 +180,16 @@ public class vtkSolidObject {
 		if (actors.size() == 0)
 			return;
 		vtkRenderer ren = panel.GetRenderer();
+		if (ren == null)
+			return;
+		panel.lock();
 		for (vtkProp3D act : actors) {
 			if (act.GetVTKId() != 0) {
 				ren.RemoveActor(act);
 				act.Delete();
 			}
 		}
+		panel.unlock();
 		actors.clear();
 		solid.clear();
 		edges.clear();
@@ -197,6 +201,8 @@ public class vtkSolidObject {
 		if (actors.size() == 0)
 			return;
 		vtkRenderer ren = panel.GetRenderer();
+		if (ren == null)
+			return;
 		panel.lock();
 		for (vtkProp3D act : actors) {
 			if (act.GetVTKId() != 0) {