Merge branch 'dev' into feature/df-new

# Conflicts:
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooser.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/ValueChooserBase.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisionTreeFragment.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/editor/VisualObjectEditorFragment.kt
#	visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/VisualObjectFXBinding.kt
This commit is contained in:
Alexander Nozik 2021-08-11 20:33:19 +03:00
parent 1505aa8091
commit c425f3b36f

View File

@ -150,7 +150,7 @@ public interface FX3DFactory<in T : Solid> {
public operator fun invoke(obj: T, binding: VisualObjectFXBinding): Node
public companion object {
public const val TYPE = "fx3DFactory"
public const val TYPE: String = "fx3DFactory"
}
}