Prevent editing null values

[simantics/3d.git] / org.simantics.g3d / src / org / simantics / g3d / property / AnnotatedPropertyTabContributorFactory.java

diff --git a/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java b/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java
index 21e773c1c82c2fdf4dbda2e91a3e59afdeb272ee..f5db540e81640a7082853e538e7aee28410219f8 100644 (file)
--- a/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/property/AnnotatedPropertyTabContributorFactory.java
@@ -748,7 +748,11 @@ public class AnnotatedPropertyTabContributorFactory implements PropertyTabContri
                        PropertyItem item = (PropertyItem)element;
                        if (tab.getManipulator(item).getValueCount() <= index)
                                return false;
-                       return (item.setter != null);
+                       if (item.setter == null)
+                               return false;
+                       if (getValue(element) == null)
+                               return false;
+                       return true;
                }
                
                @Override