Merge pull request #8379 from karroffel/obj-import-reenable

re-enabled obj import

editor/editor_node.cpp

@@ -4862,9 +4862,9 @@ EditorNode::EditorNode() {
 		import_wav.instance();
 		ResourceFormatImporter::get_singleton()->add_importer(import_wav);
 
-		//Ref<ResourceImporterOBJ> import_obj;
-		//import_obj.instance();
-		//ResourceFormatImporter::get_singleton()->add_importer(import_obj);
+		Ref<ResourceImporterOBJ> import_obj;
+		import_obj.instance();
+		ResourceFormatImporter::get_singleton()->add_importer(import_obj);
 
 		Ref<ResourceImporterScene> import_scene;
 		import_scene.instance();