From c425f3b36f9afd90662a23387e0badd6b9e69b94 Mon Sep 17 00:00:00 2001
From: Alexander Nozik <altavir@gmail.com>
Date: Wed, 11 Aug 2021 20:33:19 +0300
Subject: [PATCH] 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
---
 .../main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt
index 84dcb31d..9aed5d50 100644
--- a/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt
+++ b/visionforge-fx/src/main/kotlin/space/kscience/visionforge/solid/FX3DPlugin.kt
@@ -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"
     }
 }