Add nullable attribute for gen types + fix Unions

Author: vidartf

js/scripts/prop-types.js

@@ -22,29 +22,31 @@ _.extend(BaseType.prototype, {
     },
 })
 
-function ThreeType(typeName) {
+function ThreeType(typeName, nullable=true) {
     this.typeName = typeName;
     this.defaultValue = null;
     this.serialize = true;
+    this.nullable = nullable;
 }
 _.extend(ThreeType.prototype, BaseType.prototype, {
     getTraitlet: function() {
+        var nullableStr = this.nullable ? 'True' : 'False';
         // allow type unions
         if (this.typeName instanceof Array) {
             // TODO: only instan
             var instances = this.typeName.map(function(typeName) {
-                return '        Instance(' + typeName + ', allow_none=True).tag(sync=True, **widget_serialization)';
+                return '        Instance(' + typeName + ', allow_none=' + nullableStr +')';
             });
-            return 'Union([\n' + instances.join(',\n') + '\n    ])';
+            return 'Union([\n' + instances.join(',\n') + '\n    ]).tag(sync=True, **widget_serialization)';
 
             // return 'Any()';
         }
 
         if (this.typeName.toLowerCase() === 'this') {
             return 'This().tag(sync=True, **widget_serialization)';
         }
-        
-        return 'Instance(' + this.typeName + ', allow_none=True).tag(sync=True, **widget_serialization)';
+
+        return 'Instance(' + this.typeName + ', allow_none=' + nullableStr +').tag(sync=True, **widget_serialization)';
     },
     getPropArrayName: function() {
         return 'three_properties';

js/scripts/three-class-config.js

@@ -783,8 +783,8 @@ module.exports = {
         superClass: 'Object3D',
         constructorArgs: [ 'geometry', 'material' ],
         properties: {
-            material: new Types.ThreeType('Material'),
-            geometry: new Types.ThreeType(['Geometry', 'BufferGeometry']),
+            material: new Types.ThreeType('Material', false),
+            geometry: new Types.ThreeType(['Geometry', 'BufferGeometry'], false),
         }
     },
     Points: {