Merge pull request #81 from specklesystems/2.15

Fixes for build issues

.circleci/config.yml

@@ -3,6 +3,11 @@ version: 2.1
 orbs:
   aws-s3: circleci/aws-s3@2.0.0
 
+parameters:
+  marketplace-deploy:
+    type: boolean
+    default: false 
+
 commands:
   zip-source:
     parameters:
@@ -19,6 +24,22 @@ commands:
             stashName=`git stash create`;
             git archive -o "<<parameters.outputdir>>/speckle-unreal-UE<<parameters.target>>.zip" --worktree-attributes --prefix="speckle-unreal/" $stashName
 
+  add-source-copyright:
+    parameters:
+      copyright-string:
+        type: string
+    steps:
+      - run:
+          name: "Add copyright notice to source files"
+          command: |
+            shopt -s globstar
+            for file in Source/**/*.{cpp,hpp,c,h,cs};
+              do if [ -f $file ]; then
+                sed -i '1s/^/\/\/ <<parameters.copyright-string>>\n/' $file;
+                echo "added copyright notice to $file";
+              fi;
+            done;
+
 jobs:
   generate-source-zip:
     docker:
@@ -28,6 +49,8 @@ jobs:
         type: string
     steps:
       - checkout
+      - add-source-copyright:
+          copyright-string: "Copyright AEC SYSTEMS 2022"
       - zip-source:
             target: <<parameters.target>>
             outputdir: "output/unreal/<<parameters.target>>"
@@ -55,48 +78,33 @@ jobs:
 
 workflows:
   marketplace-publish:
+    when: <<pipeline.parameters.marketplace-deploy>>
     jobs:
       - generate-source-zip:
           name: "Generate Source Archive UE4.26"
           target: "4.26"
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?(\/all)?$/
       - generate-source-zip:
           name: "Generate Source Archive UE4.27"
           target: "4.27"
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?(\/all)?$/
       - generate-source-zip:
           name: "Generate Source Archive UE5.0"
           target: "5.0"
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?(\/all)?$/
+      - generate-source-zip:
+          name: "Generate Source Archive UE5.1"
+          target: "5.1"      
+      - generate-source-zip:
+          name: "Generate Source Archive UE5.2"
+          target: "5.2"
       - hold:
           type: approval
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?(\/all)?$/
           requires: 
             - "Generate Source Archive UE4.26"
             - "Generate Source Archive UE4.27"
             - "Generate Source Archive UE5.0"
+            - "Generate Source Archive UE5.1"
+            - "Generate Source Archive UE5.2"
       - marketplace-deploy:
           name: "Deploy to marketplace"
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-\w+)?(\/all)?$/
+          context: do-spaces-speckle-releases
           requires:
             - hold

.gitattributes

@@ -1,4 +1 @@
-.gitattributes export-ignore
-.github/* export-ignore
-.circleci/* export-ignore
 .pluginconfig/* export-ignore

.github/workflows/close-issue.yml

@@ -6,73 +6,7 @@ on:
 
 jobs:
   update_issue:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get project data
-        env:
-          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
-          ORGANIZATION: specklesystems
-          PROJECT_NUMBER: 9
-        run: |
-          gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
-            query($org: String!, $number: Int!) {
-              organization(login: $org){
-                projectNext(number: $number) {
-                  id
-                  fields(first:20) {
-                    nodes {
-                      id
-                      name
-                      settings
-                    }
-                  }
-                }
-              }
-            }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
-
-          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
-          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
-          
-          echo "$PROJECT_ID"
-          echo "$STATUS_FIELD_ID"
-          
-          echo 'DONE_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .settings | fromjson | .options[] | select(.name== "Done") | .id' project_data.json) >> $GITHUB_ENV
-          echo "$DONE_ID"
-
-      - name: Add Issue to project #it's already in the project, but we do this to get its node id!
-        env:
-          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
-          ISSUE_ID: ${{ github.event.issue.node_id }}
-        run: |
-          item_id="$( gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
-            mutation($project:ID!, $id:ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $id}) {
-                projectNextItem {
-                  id
-                }
-              }
-            }' -f project=$PROJECT_ID -f id=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
-          
-          echo 'ITEM_ID='$item_id >> $GITHUB_ENV
-          
-      - name: Update Status
-        env:
-          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
-          ISSUE_ID: ${{ github.event.issue.node_id }}
-        run: |
-          gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
-            mutation($project:ID!, $status:ID!, $id:ID!, $value:String!) {
-              set_status: updateProjectNextItemField(
-                input: {
-                  projectId: $project
-                  itemId: $id
-                  fieldId: $status
-                  value: $value
-                }
-              ) {
-                projectNextItem {
-                  id
-                }
-              }
-            }' -f project=$PROJECT_ID -f status=$STATUS_FIELD_ID -f id=$ITEM_ID -f value=${{ env.DONE_ID }}
-          
+    uses: specklesystems/github-actions/.github/workflows/project-add-issue.yml@main
+    secrets: inherit
+    with:
+      issue-id: ${{ github.event.issue.node_id }}

.github/workflows/open-issue.yml

@@ -6,45 +6,7 @@ on:
 
 jobs:
   track_issue:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get project data
-        env:
-          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
-          ORGANIZATION: specklesystems
-          PROJECT_NUMBER: 9
-        run: |
-          gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
-            query($org: String!, $number: Int!) {
-              organization(login: $org){
-                projectNext(number: $number) {
-                  id
-                  fields(first:20) {
-                    nodes {
-                      id
-                      name
-                      settings
-                    }
-                  }
-                }
-              }
-            }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
-
-          echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV
-          echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV
-     
-      - name: Add Issue to project
-        env:
-          GITHUB_TOKEN: ${{secrets.GHPROJECT_TOKEN}}
-          ISSUE_ID: ${{ github.event.issue.node_id }}
-        run: |
-          item_id="$( gh api graphql --header 'GraphQL-Features: projects_next_graphql' -f query='
-            mutation($project:ID!, $id:ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $id}) {
-                projectNextItem {
-                  id
-                }
-              }
-            }' -f project=$PROJECT_ID -f id=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
-          
-          echo 'ITEM_ID='$item_id >> $GITHUB_ENV
+    uses: specklesystems/github-actions/.github/workflows/project-add-issue.yml@main
+    secrets: inherit
+    with:
+      issue-id: ${{ github.event.issue.node_id }}

.pluginconfig/4.26/.gitattributes

@@ -0,0 +1,6 @@
+.gitattributes export-ignore
+.github/* export-ignore
+.circleci/* export-ignore
+.circleci/ export-ignore
+.pluginconfig/* export-ignore
+LICENSE export-ignore

.pluginconfig/4.26/SpeckleUnreal.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "2.7.0",
+	"VersionName": "2.15.0",
 	"FriendlyName": "Speckle Unreal",
 	"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
 	"Category": "AEC",

.pluginconfig/4.27/.gitattributes

@@ -0,0 +1,6 @@
+.gitattributes export-ignore
+.github/* export-ignore
+.circleci/* export-ignore
+.circleci/ export-ignore
+.pluginconfig/* export-ignore
+LICENSE export-ignore

.pluginconfig/4.27/SpeckleUnreal.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "2.7.0",
+	"VersionName": "2.15.0",
 	"FriendlyName": "Speckle Unreal",
 	"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
 	"Category": "AEC",

.pluginconfig/5.0/.gitattributes

@@ -0,0 +1,6 @@
+.gitattributes export-ignore
+.github/* export-ignore
+.circleci/* export-ignore
+.circleci/ export-ignore
+.pluginconfig/* export-ignore
+LICENSE export-ignore

.pluginconfig/5.0/SpeckleUnreal.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "2.7.0",
+	"VersionName": "2.15.0",
 	"FriendlyName": "Speckle Unreal",
 	"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
 	"Category": "AEC",

.pluginconfig/5.1/.gitattributes

@@ -0,0 +1,6 @@
+.gitattributes export-ignore
+.github/* export-ignore
+.circleci/* export-ignore
+.circleci/ export-ignore
+.pluginconfig/* export-ignore
+LICENSE export-ignore

.pluginconfig/5.1/SpeckleUnreal.uplugin

@@ -0,0 +1,42 @@
+{
+	"FileVersion": 3,
+	"Version": 1,
+	"VersionName": "2.15.0",
+	"FriendlyName": "Speckle Unreal",
+	"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
+	"Category": "AEC",
+	"CreatedBy": "Speckle",
+	"CreatedByURL": "https://speckle.systems/",
+	"DocsURL": "https://github.com/specklesystems/speckle-unreal",
+	"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/98770ce9d4f143de8dd7882a707a6f81",
+	"SupportURL": "https://speckle.community/",
+	"CanContainContent": true,
+	"IsBetaVersion": true,
+	"IsExperimentalVersion": false,
+	"Installed": false,
+	"EngineVersion": "5.1",
+	"Modules": [
+		{
+			"Name": "SpeckleUnreal",
+			"Type": "Runtime",
+			"LoadingPhase": "Default",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		},
+		{
+			"Name": "SpeckleUnrealEditor",
+			"Type": "Editor",
+			"LoadingPhase": "PostEngineInit",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		}
+	],
+	"Plugins": [
+		{
+			"Name": "ProceduralMeshComponent",
+			"Enabled": true
+		},
+		{
+			"Name": "LidarPointCloud",
+			"Enabled": true
+		}
+	]
+}

.pluginconfig/5.2/.gitattributes

@@ -0,0 +1,6 @@
+.gitattributes export-ignore
+.github/* export-ignore
+.circleci/* export-ignore
+.circleci/ export-ignore
+.pluginconfig/* export-ignore
+LICENSE export-ignore

.pluginconfig/5.2/SpeckleUnreal.uplugin

@@ -0,0 +1,42 @@
+{
+	"FileVersion": 3,
+	"Version": 1,
+	"VersionName": "2.15.0",
+	"FriendlyName": "Speckle Unreal",
+	"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
+	"Category": "AEC",
+	"CreatedBy": "Speckle",
+	"CreatedByURL": "https://speckle.systems/",
+	"DocsURL": "https://github.com/specklesystems/speckle-unreal",
+	"MarketplaceURL": "com.epicgames.launcher://ue/marketplace/product/98770ce9d4f143de8dd7882a707a6f81",
+	"SupportURL": "https://speckle.community/",
+	"CanContainContent": true,
+	"IsBetaVersion": true,
+	"IsExperimentalVersion": false,
+	"Installed": false,
+	"EngineVersion": "5.2",
+	"Modules": [
+		{
+			"Name": "SpeckleUnreal",
+			"Type": "Runtime",
+			"LoadingPhase": "Default",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		},
+		{
+			"Name": "SpeckleUnrealEditor",
+			"Type": "Editor",
+			"LoadingPhase": "PostEngineInit",
+			"WhitelistPlatforms": [ "Win64", "Linux", "Mac" ]
+		}
+	],
+	"Plugins": [
+		{
+			"Name": "ProceduralMeshComponent",
+			"Enabled": true
+		},
+		{
+			"Name": "LidarPointCloud",
+			"Enabled": true
+		}
+	]
+}

Config/DefaultSpeckleUnreal.ini

@@ -0,0 +1,2 @@
+[CoreRedirects]
++FunctionRedirects=(OldName="/Script/SpeckleUnreal.ObjectModelRegistry.FindClosestType",NewName="/Script/SpeckleUnreal.ObjectModelRegistry.GetAtomicType")

Config/FilterPlugin.ini

@@ -1,3 +1,2 @@
 [FilterPlugin]
-/README.md
-/LICENSE
+/README.md

README.md

@@ -7,7 +7,7 @@ This plugin connects Unreal Engine to Speckle, allowing you to receive your vers
 enabling interoperable collaboration between Unreal and other Speckle connectors (Revit, Rhino, Blender, Sketchup, Unity, AutoCAD, [and more!](https://speckle.systems/features/connectors/))
 
 
-https://user-images.githubusercontent.com/45512892/181620836-9c7e6a7f-4f18-48e5-a574-5eebc2abd35f.mp4
+https://user-images.githubusercontent.com/45512892/187969471-3f548b17-3388-48ee-a07c-bd3a0ecf5149.mp4
 
 
 Checkout our dedicated [Tutorials and Docs](https://speckle.systems/tag/unreal/).
@@ -17,7 +17,7 @@ and [join our community forum](https://speckle.community/) where you can post an
 
 ## Notice
 
-We support Unreal Engine 4.26, 4.27, 5.0
+We officially support Unreal Engine 4.27, 5.0, 5.1, 5.2
 
 **Features**:
 - [Receiving Speckle geometry as Actors in editor and standalone runtime](https://speckle.systems/tutorials/getting-started-with-speckle-for-unreal/).
@@ -32,7 +32,7 @@ We support Unreal Engine 4.26, 4.27, 5.0
 | ---: | :---: | :--- |
 | [`Objects.Geometry.Mesh`](https://github.com/specklesystems/speckle-sharp/blob/main/Objects/Objects/Geometry/Mesh.cs) | → | [Static Mesh Component](https://docs.unrealengine.com/4.27/en-US/API/Runtime/Engine/Components/UStaticMeshComponent/) /<br/> [Procedural Mesh Component](https://docs.unrealengine.com/4.27/en-US/API/Plugins/ProceduralMeshComponent/UProceduralMeshComponent/) |
 | [`Objects.Geometry.PointCloud`](https://github.com/specklesystems/speckle-sharp/blob/main/Objects/Objects/Geometry/Pointcloud.cs) | → | [LiDAR Point Cloud](https://docs.unrealengine.com/4.27/en-US/WorkingWithContent/LidarPointCloudPlugin/LidarPointCloudPluginReference/) |
-| [`Objects.Other.BlockInstance`](https://github.com/specklesystems/speckle-sharp/blob/main/Objects/Objects/Other/Block.cs) | → | Actor with Transform |
+| [`Objects.Other.Instance`](https://github.com/specklesystems/speckle-sharp/blob/main/Objects/Objects/Other/Instance.cs) | → | Actor with Transform |
 | [`Objects.BuiltElements.View`](https://github.com/specklesystems/speckle-sharp/blob/main/Objects/Objects/BuiltElements/View.cs) | → | [Camera](https://docs.unrealengine.com/4.27/en-US/InteractiveExperiences/Framework/Camera/) |
 
 **Supported platforms**: Windows, Linux, MacOS
@@ -43,13 +43,15 @@ We support Unreal Engine 4.26, 4.27, 5.0
 - Currently no support for sending Unreal geometry to Speckle.
 - Does not use the .NET or Python SDK, or the Speckle Kit based workflow, all code is in native C++/BP.
 - Does not use our shared [Desktop UI 2](https://speckle.guide/user/ui2.html), only a simple editor UI is currently provided.
- 
+- Does not fetch [accounts from Speckle Manager](https://speckle.guide/user/manager.html#logging-in-adding-accounts), you must generate a [personal access token (auth token)](https://speckle.guide/dev/tokens.html#personal-access-tokens) to receive non-public streams.
+
 ## How to install
 
-<!--- Soon to be!
-Speckle for Unreal Engine can be installed through the [Unreal Engine Marketplace](com.epicgames.launcher://ue/marketplace/product/98770ce9d4f143de8dd7882a707a6f81).
+**Speckle for Unreal Engine** can be installed through the [Unreal Engine Marketplace](https://www.unrealengine.com/marketplace/en-US/product/speckle-for-unreal-engine).
 
-Alternatively, developers may prefer to install manually.-->
+---
+
+Alternatively, developers may prefer to install manually.
 1. Git clone [this repo](https://github.com/specklesystems/speckle-unreal) (or download and extract the [archive zip](https://github.com/specklesystems/speckle-unreal/archive/refs/heads/main.zip)) into your project's `Plugins` directory (created as needed)
 2. Open/Restart your Unreal project. This will build the plugin for your environment.
 

Source/SpeckleUnreal/Private/API/ClientAPI.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "API/ClientAPI.h"
 
@@ -129,7 +128,10 @@ FHttpRequestRef FClientAPI::CreatePostRequest(const FString& ServerUrl, const FS
 	Request->SetVerb(TEXT("POST"));
 	Request->SetHeader("Accept-Encoding", Encoding);
 	Request->SetHeader("Content-Type", TEXT("application/json"));
-	Request->SetHeader("Authorization", "Bearer " + AuthToken);
+	if(!AuthToken.IsEmpty())
+		Request->SetHeader("Authorization","Bearer " + AuthToken);
+	Request->SetHeader("apollographql-client-name", "Unreal Engine");
+	Request->SetHeader("apollographql-client-version", SPECKLE_CONNECTOR_VERSION);
 	Request->SetContentAsString(PostPayload);
 
 	return Request;

Source/SpeckleUnreal/Private/API/Operations/ReceiveOperation.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "API/Operations/ReceiveOperation.h"
 

Source/SpeckleUnreal/Private/API/Operations/SpeckleStreamAPIOperation.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "API/Operations/SpeckleStreamAPIOperation.h"
 

Source/SpeckleUnreal/Private/API/SpeckleAPIFunctions.cpp

@@ -1,6 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
-
-
 
 #include "API/SpeckleAPIFunctions.h"
 

Source/SpeckleUnreal/Private/API/SpeckleSerializer.cpp

@@ -1,9 +1,9 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "API/SpeckleSerializer.h"
 
 #include "Objects/Base.h"
 #include "LogSpeckle.h"
+#include "Objects/DisplayValueElement.h"
 #include "Objects/Utils/SpeckleObjectUtils.h"
 #include "Objects/ObjectModelRegistry.h"
 #include "Templates/SubclassOf.h"
@@ -29,13 +29,15 @@ UBase* USpeckleSerializer::DeserializeBase(const TSharedPtr<FJsonObject> Obj,
 	Obj->TryGetStringField("id", ObjectId);
 		
 	TSubclassOf<UBase> BaseType;
-
-	FString WorkingType(SpeckleType);
 	
-	int32 Tries = 1000;
+	FString WorkingType{};
+	FString Remainder = FString(SpeckleType);
+
+	int32 Tries = 200;
 	while(ensure(Tries-- > 0))
 	{
-		//Try and deserialize
+		const bool IsLastChance = !UObjectModelRegistry::SplitSpeckleType(Remainder, Remainder, WorkingType);
+		
 		if(UObjectModelRegistry::TryGetRegisteredType(WorkingType, BaseType))
 		{
 			UBase* Base = NewObject<UBase>(GetTransientPackage(), BaseType);
@@ -43,20 +45,30 @@ UBase* USpeckleSerializer::DeserializeBase(const TSharedPtr<FJsonObject> Obj,
 				return Base; 
 		}
 
-		//If we couldn't even deserialize this to a Base
+		if(IsLastChance)
+		{
+			//Try a fallback displayValue object
+			UBase* Base = NewObject<UBase>(GetTransientPackage(), UDisplayValueElement::StaticClass());
+			if(Base->Parse(Obj, ReadTransport))
+				return Base;
+
+			//If not, try a regular Base
+			Base = NewObject<UBase>(GetTransientPackage(), UBase::StaticClass());
+			if(Base->Parse(Obj, ReadTransport))
+				return Base;
+
+			UE_LOG(LogSpeckle, Warning, TEXT("Skipping deserilization of %s id: %s - object could not be deserilaized to Base"), *SpeckleType, *ObjectId );
+			return nullptr;
+		}
+		
+		//If we couldn't even deserialize this to a Base, something is quite wrong...
 		if(WorkingType == "Base" || BaseType == UBase::StaticClass())
 		{
 			UE_LOG(LogSpeckle, Warning, TEXT("Skipping deserilization of %s id: %s - object could not be deserilaized to Base"), *SpeckleType, *ObjectId );
 			return nullptr;
 		}
-
-		//Try the next type
-		if(!UObjectModelRegistry::ParentType(WorkingType, WorkingType))
-		{
-			WorkingType = "Base";
-			UE_LOG(LogSpeckle, Verbose, TEXT("Unrecognised SpeckleType %s - Object id: %s Will be deserialized as Base"), *SpeckleType, *ObjectId );
-		}
 	}
+	
 	return nullptr;
 }
 

Source/SpeckleUnreal/Private/Analytics.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Mixpanel.h"
 
@@ -19,31 +18,26 @@ const FString FAnalytics::VersionedApplicationName = FString::Printf(TEXT("Unrea
 
 void FAnalytics::TrackEvent(const FString& Server, const FString& EventName)
 {
-#if !SUPPRESS_SPECKLE_ANALYTICS
 	const TMap<FString, FString> CustomProperties;
 	TrackEvent( Server, EventName, CustomProperties);
-#endif
 }
 
 void FAnalytics::TrackEvent(const FString& Server, const FString& EventName, const TMap<FString, FString>& CustomProperties)
 {
-#if !SUPPRESS_SPECKLE_ANALYTICS
 	//Since we don't have access to users email address, we will hash the system user name instead (better than not tracking users at all) 
-	const FString Email = FString(FGenericPlatformProcess::ComputerName()) + FString(FGenericPlatformProcess::UserName());
-	TrackEvent(Email, Server, EventName, CustomProperties);
-#endif
+	const FString UserID = FString(FPlatformProcess::ComputerName()) + FString(FPlatformProcess::UserName());
+	TrackEvent(UserID, Server, EventName, CustomProperties);
 }
 
-void FAnalytics::TrackEvent(const FString& Email, const FString& Server, const FString& EventName, const TMap<FString, FString>& CustomProperties)
+void FAnalytics::TrackEvent(const FString& UserID, const FString& Server, const FString& EventName, const TMap<FString, FString>& CustomProperties)
 {
-#if !SUPPRESS_SPECKLE_ANALYTICS
 
-	FString HashedEmail = "@" + Hash(Email); //prepending an @ so we distinguish logged and non-logged users
+	FString HashedUserID = "@" + Hash(UserID); //prepending an @ so we distinguish logged and non-logged users
 	FString HashedServer = Hash(Server);
 	
 	TMap<FString, FString> Properties 
 	{
-		{ "distinct_id", HashedEmail },
+		{ "distinct_id", HashedUserID },
 		{ "server_id", HashedServer },
 		{ "token", MixpanelToken },
 		{ "hostApp", "Unreal Engine" },
@@ -87,7 +81,6 @@ void FAnalytics::TrackEvent(const FString& Email, const FString& Server, const F
 	{
 		UE_LOG(LogSpeckle, Log, TEXT("Failed to send Mixpanel event to %s"), *MixpanelServer);
 	}
-#endif
 }
 
 FString FAnalytics::Hash(const FString& Input)

Source/SpeckleUnreal/Private/Conversion/Converters/AggregateConverter.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Conversion/Converters/AggregateConverter.h"
 

Source/SpeckleUnreal/Private/Conversion/Converters/BlockConverter.cpp

@@ -1,14 +1,15 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Conversion/Converters/BlockConverter.h"
 
 #include "Objects/Other/BlockInstance.h"
 #include "Objects/Utils/SpeckleObjectUtils.h"
 #include "Engine/World.h"
+#include "Objects/Other/RevitInstance.h"
 
 UBlockConverter::UBlockConverter()
 {
 	SpeckleTypes.Add(UBlockInstance::StaticClass());
+	SpeckleTypes.Add(URevitInstance::StaticClass());
 	
 	BlockInstanceActorType = AActor::StaticClass();
 	ActorMobility = EComponentMobility::Static;
@@ -16,13 +17,13 @@ UBlockConverter::UBlockConverter()
 
 UObject* UBlockConverter::ConvertToNative_Implementation(const UBase* SpeckleBase, UWorld* World, TScriptInterface<ISpeckleConverter>&)
 {
-	const UBlockInstance* Block = Cast<UBlockInstance>(SpeckleBase);
+	const UInstance* Block = Cast<UInstance>(SpeckleBase);
 	if(Block == nullptr) return nullptr;
 
 	return BlockToNative(Block, World);
 }
 
-AActor* UBlockConverter::BlockToNative(const UBlockInstance* Block, UWorld* World)
+AActor* UBlockConverter::BlockToNative(const UInstance* Block, UWorld* World)
 {
 	AActor* BlockActor = CreateEmptyActor(World, USpeckleObjectUtils::CreateTransform(Block->Transform));
 	//Return the block actor as is,

Source/SpeckleUnreal/Private/Conversion/Converters/MaterialConverter.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Conversion/Converters/MaterialConverter.h"
 
@@ -7,12 +6,15 @@
 #include "Materials/MaterialInstanceDynamic.h"
 #include "Objects/Other/RenderMaterial.h"
 #include "UObject/ConstructorHelpers.h"
+#include "Materials/MaterialInterface.h"
+#include "Misc/Paths.h"
+#include "UObject/Package.h"
 
 
 UMaterialConverter::UMaterialConverter()
 {
-	static ConstructorHelpers::FObjectFinder<UMaterial> SpeckleMaterial(TEXT("Material'/SpeckleUnreal/SpeckleMaterial.SpeckleMaterial'"));
-	static ConstructorHelpers::FObjectFinder<UMaterial> SpeckleGlassMaterial(TEXT("Material'/SpeckleUnreal/SpeckleGlassMaterial.SpeckleGlassMaterial'"));
+	static ConstructorHelpers::FObjectFinder<UMaterialInterface> SpeckleMaterial(TEXT("Material'/SpeckleUnreal/SpeckleMaterial.SpeckleMaterial'"));
+	static ConstructorHelpers::FObjectFinder<UMaterialInterface> SpeckleGlassMaterial(TEXT("Material'/SpeckleUnreal/SpeckleGlassMaterial.SpeckleGlassMaterial'"));
 
 	DefaultMeshMaterial = SpeckleMaterial.Object;
 	BaseMeshOpaqueMaterial = SpeckleMaterial.Object;
@@ -79,7 +81,7 @@ bool UMaterialConverter::TryGetOverride(const URenderMaterial* SpeckleMaterial,
 	{
 		if(ensureAlways(IsValid(Mat)) && Mat->GetName() == Name)
 		{
-			OutMaterial = MaterialOverridesById[MaterialID];
+			OutMaterial = *MaterialOverridesByName.Find(Mat);
 			return true;
 		}
 	}

Source/SpeckleUnreal/Private/Conversion/Converters/PointCloudConverter.cpp

@@ -1,11 +1,12 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Conversion/Converters/PointCloudConverter.h"
 
 #include "LidarPointCloudActor.h"
+#include "LidarPointCloudShared.h"
 #include "LidarPointCloudComponent.h"
 #include "Objects/Geometry/PointCloud.h"
-
+#include "Engine/World.h"
+#include "Runtime/Launch/Resources/Version.h"
 
 UPointCloudConverter::UPointCloudConverter()
 {

Source/SpeckleUnreal/Private/Conversion/Converters/ProceduralMeshConverter.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Conversion/Converters/ProceduralMeshConverter.h"
 
@@ -67,19 +66,19 @@ AActor* UProceduralMeshConverter::MeshToNative(const UMesh* SpeckleMesh,
         
         if (n == 3) //Triangles
         {
-            Faces.Add(SpeckleMesh->Faces[i + 3]);
-            Faces.Add(SpeckleMesh->Faces[i + 2]);
             Faces.Add(SpeckleMesh->Faces[i + 1]);
+            Faces.Add(SpeckleMesh->Faces[i + 2]);
+            Faces.Add(SpeckleMesh->Faces[i + 3]);
         }
         else if(n == 4) // Quads
         {
+            Faces.Add(SpeckleMesh->Faces[i + 1]);
+            Faces.Add(SpeckleMesh->Faces[i + 3]);
             Faces.Add(SpeckleMesh->Faces[i + 4]);
-            Faces.Add(SpeckleMesh->Faces[i + 3]);
-            Faces.Add(SpeckleMesh->Faces[i + 1]);
 
-            Faces.Add(SpeckleMesh->Faces[i + 3]);
-            Faces.Add(SpeckleMesh->Faces[i + 2]);
             Faces.Add(SpeckleMesh->Faces[i + 1]);
+            Faces.Add(SpeckleMesh->Faces[i + 2]);
+            Faces.Add(SpeckleMesh->Faces[i + 3]);
         }
         else
         {

Source/SpeckleUnreal/Private/Conversion/Converters/StaticMeshConverter.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Conversion/Converters/StaticMeshConverter.h"
 
@@ -16,6 +15,10 @@
 #include "Objects/DisplayValueElement.h"
 #include "Objects/Other/RenderMaterial.h"
 #include "Objects/Utils/SpeckleObjectUtils.h"
+#include "Components/StaticMeshComponent.h"
+#include "Misc/Paths.h"
+#include "UObject/Package.h"
+#include "Materials/MaterialInterface.h"
 
 #define LOCTEXT_NAMESPACE "FSpeckleUnrealModule"
 
@@ -23,6 +26,8 @@ UStaticMeshConverter::UStaticMeshConverter()
 {
 	SpeckleTypes.Add(UMesh::StaticClass());
 	SpeckleTypes.Add(UDisplayValueElement::StaticClass());
+
+	HiddenTypes.Add("Objects.BuiltElements.Room");
 	
 #if WITH_EDITORONLY_DATA
 	UseFullBuild = true;
@@ -116,6 +121,15 @@ AActor* UStaticMeshConverter::MeshesToNativeActor(const UBase* Parent, const TAr
 	}
 
 	MeshComponent->SetStaticMesh(Mesh);
+
+	for(const FString& t: HiddenTypes)
+	{
+		if(Parent->SpeckleType.Contains(t))
+		{
+			MeshComponent->SetVisibility(false);
+			break;
+		}
+	}
 	
 	int i = 0;
 	for(const UMesh* DisplayMesh : SpeckleMeshes)

Source/SpeckleUnreal/Private/Conversion/SpeckleConverterComponent.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Conversion/SpeckleConverterComponent.h"
 
@@ -10,7 +9,9 @@
 #include "Conversion/Converters/StaticMeshConverter.h"
 #include "Conversion/Converters/MaterialConverter.h"
 #include "Misc/ScopedSlowTask.h"
+#include "Objects/Utils/SpeckleObjectUtils.h"
 #include "UObject/ConstructorHelpers.h"
+#include "Dom/JsonValue.h"
 
 #define LOCTEXT_NAMESPACE "FSpeckleUnrealModule"
 
@@ -127,12 +128,14 @@ void USpeckleConverterComponent::AttachConvertedToOwner(AActor* AOwner, const UB
 		{
 	#if WITH_EDITOR
 			{
-				FString Name;
-				FText _Discard;
-				if( !(Base->TryGetDynamicString("name", Name) && FActorEditorUtils::ValidateActorName(FText::FromString(Name), _Discard)) )
+				FString Name = USpeckleObjectUtils::GetFriendlyObjectName(Base);
+				FText NameErrors;
+				
+				if(!FActorEditorUtils::ValidateActorName(FText::FromString(Name), NameErrors))
 				{
-					Name = FString::Printf(TEXT("%s - %s"), *Base->SpeckleType, *Base->Id);
+					Name = USpeckleObjectUtils::GetBoringObjectName(Base);
 				}
+				
 				NativeActor->SetActorLabel(Name);
 			}
 	#endif

Source/SpeckleUnreal/Private/LogSpeckle.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "LogSpeckle.h"
 #include "Logging/LogMacros.h"

Source/SpeckleUnreal/Private/Objects/DisplayValueElement.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Objects/DisplayValueElement.h"
 
@@ -9,8 +8,6 @@
 TArray<FString> UDisplayValueElement::DisplayValueAliasStrings = {
 	"displayValue",
 	"@displayValue",
-	"displayMesh"
-	"@displayMesh"
 };
 
 

Source/SpeckleUnreal/Private/Objects/Geometry/Mesh.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Objects/Geometry/Mesh.h"
 

Source/SpeckleUnreal/Private/Objects/Geometry/PointCloud.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Objects/Geometry/PointCloud.h"
 

Source/SpeckleUnreal/Private/Objects/ObjectModelRegistry.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Objects/ObjectModelRegistry.h"
 
@@ -22,65 +21,81 @@ void UObjectModelRegistry::GenerateTypeRegistry()
 		if (Class->IsChildOf(UBase::StaticClass()) &&
 			!Class->HasAnyClassFlags(CLASS_Abstract))
 		{
-			const FString& SpeckleType = Class->GetDefaultObject<UBase>()->SpeckleType;;
-
-			ensureAlwaysMsgf(!TypeRegistry.Contains(SpeckleType),
-				TEXT("Base class: %s conflicts with: %s for SpeckleType: %s"),
+			const FString& SpeckleType = Class->GetDefaultObject<UBase>()->SpeckleType;
+			const FString TypeName = GetTypeName(SpeckleType);
+			
+			ensureAlwaysMsgf(!TypeRegistry.Contains(TypeName),
+				TEXT("Base class: %s conflicts with: %s for TypeName: %s"),
 				*Class->GetName(),
 				*TypeRegistry[SpeckleType]->GetName(),
 				*SpeckleType);
 
-			TypeRegistry.Add(SpeckleType, *It);
+			TypeRegistry.Add(TypeName, *It);
 		}
 	}
 }
 
 
-
-TSubclassOf<UBase> UObjectModelRegistry::FindClosestType(const FString& SpeckleType)
+bool UObjectModelRegistry::SplitSpeckleType(const FString& SpeckleType, FString& OutRemainder, FString& OutTypeName, const FString& Split)
 {
-	FString TypeString(SpeckleType);
-	TSubclassOf<UBase> Type = nullptr;
-
-	while(!TryGetRegisteredType(TypeString, Type))
+	if(SpeckleType.Split(Split, &OutRemainder, &OutTypeName, ESearchCase::CaseSensitive, ESearchDir::FromEnd))
 	{
-		if(!ParentType(TypeString, TypeString)) return nullptr;
+		return true;	
+	}
+	else
+	{
+		OutTypeName = SpeckleType;
+		return false;
 	}
-		
-	return Type;
-	
 }
 
-bool UObjectModelRegistry::ParentType(const FString& Type, FString& NextType)
+FString UObjectModelRegistry::GetTypeName(const FString& SpeckleType)
 {
-	int32 DotSplitIndex;
-	Type.FindLastChar('.', DotSplitIndex);
-	int32 ColonSplitIndex;
-	Type.FindLastChar(':', ColonSplitIndex);
-	const int32 SplitIndex = FGenericPlatformMath::Max(DotSplitIndex, ColonSplitIndex);
-
-	if(SplitIndex <= 0) return false;
-		
-	NextType = Type.Left(SplitIndex);
-	return true;
+	FString Discard, Ret;
+	SplitSpeckleType(SpeckleType, Discard, Ret);
+	return Ret;
 }
 
-TSubclassOf<UBase> UObjectModelRegistry::GetRegisteredType(const FString& SpeckleType)
+FString UObjectModelRegistry::GetSimplifiedTypeName(const FString& SpeckleType)
+{
+	FString Discard, Ret;
+	SplitSpeckleType(SpeckleType,Discard, Ret, ".");
+	return Ret;
+}
+
+TSubclassOf<UBase> UObjectModelRegistry::GetAtomicType(const FString& SpeckleType)
+{
+
+	FString WorkingType;
+	FString Remainder = FString(SpeckleType);
+
+	while(SplitSpeckleType(Remainder, Remainder, WorkingType))
+	{
+		TSubclassOf<UBase> Type;
+		if(TryGetRegisteredType(WorkingType, Type))
+		{
+			return Type;
+		}
+	}
+	return UBase::StaticClass();
+}
+
+TSubclassOf<UBase> UObjectModelRegistry::GetRegisteredType(const FString& TypeName)
 {
 	TSubclassOf<UBase> Type = nullptr;
-	TryGetRegisteredType(SpeckleType, Type);
+	TryGetRegisteredType(TypeName, Type);
 	return Type;
 }
 
-bool UObjectModelRegistry::TryGetRegisteredType(const FString& SpeckleType, TSubclassOf<UBase>& OutType)
+bool UObjectModelRegistry::TryGetRegisteredType(const FString& TypeName, TSubclassOf<UBase>& OutType)
 {
 	if(TypeRegistry.Num() == 0) GenerateTypeRegistry();
 
 
-	const bool Contains = TypeRegistry.Contains(SpeckleType);
+	const bool Contains = TypeRegistry.Contains(TypeName);
 	if(Contains)
 	{
-		OutType = *TypeRegistry.Find(SpeckleType);
+		OutType = *TypeRegistry.Find(TypeName);
 	}
 	return Contains;
 }

Source/SpeckleUnreal/Private/Objects/Other/BlockInstance.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Objects/Other/BlockInstance.h"
 #include "LogSpeckle.h"
@@ -20,15 +19,23 @@ bool UBlockInstance::Parse(const TSharedPtr<FJsonObject> Obj,  const TScriptInte
 	
 
 	//Geometries
-	const TSharedPtr<FJsonObject>* BlockDefinitionPtr;
-	if(!Obj->TryGetObjectField("blockDefinition", BlockDefinitionPtr)) return false;
+	//NOTE: This logic differs greatly from sharp/py implementations
+	const TSharedPtr<FJsonObject>* DefPtr;
+	if(!(Obj->TryGetObjectField("definition", DefPtr) || Obj->TryGetObjectField("blockDefinition", DefPtr) )) return false;
 	
-	const FString RefID = BlockDefinitionPtr->operator->()->GetStringField("referencedId");
-	const TSharedPtr<FJsonObject> BlockDefinition = ReadTransport->GetSpeckleObject(RefID);
+	const FString RefID = DefPtr->operator->()->GetStringField("referencedId");
+	const TSharedPtr<FJsonObject> Definition = ReadTransport->GetSpeckleObject(RefID);
 	
-	if(BlockDefinition->TryGetStringField("name", Name)) DynamicProperties.Remove("Name");
+	if(!Obj->TryGetStringField("name", Name))
+	{
+		if(Definition->TryGetStringField("name", Name))
+		{
+			//The instance has no name, so we'll steal it from the definition
+			DynamicProperties.Add("name", Definition->TryGetField("name"));
+		}
+	}
 
-	const auto Geometries = BlockDefinition->GetArrayField("geometry");
+	const auto Geometries = Definition->GetArrayField("geometry");
 
 	if(Geometries.Num() <= 0)
 	{

Source/SpeckleUnreal/Private/Objects/Other/RevitInstance.cpp

@@ -0,0 +1,73 @@
+
+#include "Objects/Other/RevitInstance.h"
+#include "LogSpeckle.h"
+
+#include "API/SpeckleSerializer.h"
+#include "Objects/Utils/SpeckleObjectUtils.h"
+#include "Transports/Transport.h"
+
+bool URevitInstance::Parse(const TSharedPtr<FJsonObject> Obj,  const TScriptInterface<ITransport> ReadTransport)
+{
+	if(!Super::Parse(Obj, ReadTransport)) return false;
+	
+	const float ScaleFactor = USpeckleObjectUtils::ParseScaleFactor(Units);
+
+	//Transform
+	if(!USpeckleObjectUtils::TryParseTransform(Obj, Transform)) return false;
+	Transform.ScaleTranslation(FVector(ScaleFactor));
+	DynamicProperties.Remove("Transform");
+	
+
+	//Geometries
+	//NOTE: This logic differs greatly from sharp/py implementations
+	const TSharedPtr<FJsonObject>* DefPtr;
+	if(!Obj->TryGetObjectField("definition", DefPtr)) return false;
+	
+	const FString RefID = DefPtr->operator->()->GetStringField("referencedId");
+	const TSharedPtr<FJsonObject> Definition = ReadTransport->GetSpeckleObject(RefID);
+	
+	if(!Obj->TryGetStringField("name", Name))
+	{
+		if(Definition->TryGetStringField("name", Name))
+		{
+			//The instance has no name, so we'll steal it from the definition
+			DynamicProperties.Add("name", Definition->TryGetField("name"));
+		}
+	}
+	auto Geometries = TArray<TSharedPtr<FJsonValue>>();
+	const TArray<TSharedPtr<FJsonValue>>* ElementsPtr;
+	if(Definition->TryGetArrayField("elements", ElementsPtr))
+		Geometries.Append(*ElementsPtr);
+	const TArray<TSharedPtr<FJsonValue>>* DisplayValuePtr;
+	if(Definition->TryGetArrayField("displayValue", DisplayValuePtr))
+		Geometries.Append(*DisplayValuePtr);
+	
+
+	if(Geometries.Num() <= 0)
+	{
+		UE_LOG(LogSpeckle, Warning, TEXT("Instance definition has no geometry. id: %s"), *RefID)
+		return false;
+	}
+	
+	for(const auto& Geo : Geometries)
+	{
+		const TSharedPtr<FJsonObject> MeshReference = Geo->AsObject();
+		const FString ChildId = MeshReference->GetStringField("referencedId");
+
+		if(ReadTransport->HasObject(ChildId))
+		{
+			UBase* Child = USpeckleSerializer::DeserializeBase(ReadTransport->GetSpeckleObject(ChildId), ReadTransport);
+			if(IsValid(Child))
+				Geometry.Add(Child);
+		}
+		else UE_LOG(LogSpeckle, Warning, TEXT("Block definition references an unknown object id: %s"), *ChildId)
+	}
+	DynamicProperties.Remove("geometry");
+	
+	// Intentionally don't remove blockDefinition from dynamic properties,
+	// because we want the converter to create the child geometries for us
+	//DynamicProperties.Remove("blockDefinition");
+	
+	return true;
+	
+}

Source/SpeckleUnreal/Private/Objects/Other/View3D.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Objects/Other/View3D.h"
 
@@ -11,7 +10,7 @@ bool UView3D::Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<IT
 	const float ScaleFactor = USpeckleObjectUtils::ParseScaleFactor(Units);
 
 	// Parse optional Name property
-	if(Obj->TryGetStringField("name", Name)) DynamicProperties.Remove("name");
+	if(Obj->TryGetStringField("name", Name)) { }
 	
 	// Parse Origin
 	if(!USpeckleObjectUtils::ParseVectorProperty(Obj, "origin", ReadTransport, Origin)) return false;

Source/SpeckleUnreal/Private/Objects/Utils/SpeckleObjectUtils.cpp

@@ -1,12 +1,14 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Objects/Utils/SpeckleObjectUtils.h"
 
+#include "LogSpeckle.h"
 #include "API/SpeckleSerializer.h"
 #include "Engine/World.h"
+#include "Objects/ObjectModelRegistry.h"
 #include "Objects/Geometry/Mesh.h"
 #include "Transports/Transport.h"
-
+#include "Serialization/JsonWriter.h"
+#include "Serialization/JsonSerializer.h"
 
 TArray<TSharedPtr<FJsonValue>> USpeckleObjectUtils::CombineChunks(const TArray<TSharedPtr<FJsonValue>>& ArrayField, const TScriptInterface<ITransport> Transport)
 {
@@ -70,6 +72,9 @@ float USpeckleObjectUtils::ParseScaleFactor(const FString& UnitsString)
 		if (LUnits == "miles" || LUnits == "mile" || LUnits == "mi")
 			return 160934.4;
 
+		if (LUnits == "us_ft" || LUnits == "ussurveyfeet")
+			return 12000.0 / 3937.0;
+
 		return 100;
 	};
 
@@ -94,7 +99,7 @@ bool USpeckleObjectUtils::TryParseTransform(const TSharedPtr<FJsonObject> Speckl
 	if(SpeckleObject->TryGetArrayField("transform", TransformData)) //Handle transform as array
 	{ }
 	else if(SpeckleObject->TryGetObjectField("transform", TransformObject)
-		&& (*TransformObject)->TryGetArrayField("value", TransformData)) //Handle transform as object
+		&& (*TransformObject)->TryGetArrayField("matrix", TransformData)) //Handle transform as object
 	{ }
 	else return false;
 		
@@ -170,3 +175,23 @@ FString USpeckleObjectUtils::DisplayAsString(const FString& msg, const TSharedPt
 	UE_LOG(LogSpeckle, Display, TEXT("resulting jsonString from %s -> %s"), *msg, *OutputString);
 	return OutputString;
 }
+
+FString USpeckleObjectUtils::GetFriendlyObjectName(const UBase* SpeckleObject)
+{
+	FString Prefix;
+	if(!(SpeckleObject->TryGetDynamicString("name", Prefix)
+		|| SpeckleObject->TryGetDynamicString("Name", Prefix)
+		|| SpeckleObject->TryGetDynamicString("Family", Prefix)))
+	{
+		Prefix = UObjectModelRegistry::GetSimplifiedTypeName(SpeckleObject->SpeckleType);
+	}
+	
+	return FString::Printf(TEXT("%s -- %s"), *Prefix, *SpeckleObject->Id);
+	
+}
+
+FString USpeckleObjectUtils::GetBoringObjectName(const UBase* SpeckleObject)
+{
+	const FString Prefix = UObjectModelRegistry::GetSimplifiedTypeName(SpeckleObject->SpeckleType);
+	return FString::Printf(TEXT("%s -- %s"), *Prefix, *SpeckleObject->Id);
+}

Source/SpeckleUnreal/Private/ReceiveSelectionComponent.cpp

@@ -1,11 +1,10 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "ReceiveSelectionComponent.h"
 
+#include "API/Models/SpeckleUser.h"
+#include "API/ClientAPI.h"
 #include "JsonObjectConverter.h"
 #include "LogSpeckle.h"
-#include "API/ClientAPI.h"
-#include "API/Models/SpeckleUser.h"
 
 #if WITH_EDITOR
 void UReceiveSelectionComponent::PostEditChangeProperty(FPropertyChangedEvent& e)

Source/SpeckleUnreal/Private/SpeckleUnreal.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "SpeckleUnreal.h"
 

Source/SpeckleUnreal/Private/SpeckleUnrealManager.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "SpeckleUnrealManager.h"
 
@@ -61,7 +60,7 @@ void ASpeckleUnrealManager::Receive()
 	PrintMessage(Message);
 
 	// Setup network transports
-	UServerTransport* ServerTransport = UServerTransport::CreateServerTransport(ServerUrl,StreamId,AuthToken);
+	UServerTransport* ServerTransport = UServerTransport::CreateServerTransport(ServerUrl, StreamId, AuthToken);
 	
 	if(!KeepCache && LocalObjectCache)
 	{

Source/SpeckleUnreal/Private/Tests/ReceiveSelectionComponentTest.cpp

@@ -1,5 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
-
 
 #include "LogSpeckle.h"
 #include "Misc/AutomationTest.h"

Source/SpeckleUnreal/Private/Tests/Transports/MemoryTransportTest.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Misc/AutomationTest.h"
 #include "Objects/Base.h"

Source/SpeckleUnreal/Private/Transports/MemoryTransport.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Transports/MemoryTransport.h"
 

Source/SpeckleUnreal/Private/Transports/ServerTransport.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "Transports/ServerTransport.h"
 
@@ -74,7 +73,10 @@ void UServerTransport::CopyObjectAndChildren(const FString& ObjectId,
 	Request->SetVerb("GET");
 	Request->SetURL(Endpoint);
 	Request->SetHeader("Accept", TEXT("text/plain"));
-	Request->SetHeader("Authorization", "Bearer " + AuthToken);
+	if(!AuthToken.IsEmpty())
+		Request->SetHeader("Authorization","Bearer " + AuthToken);
+	Request->SetHeader("apollographql-client-name", "Unreal Engine");
+	Request->SetHeader("apollographql-client-version", SPECKLE_CONNECTOR_VERSION);
 		
 	// Response Callback
 	auto ResponseHandler = [=](FHttpRequestPtr, FHttpResponsePtr Response, bool bWasSuccessful) mutable 
@@ -154,7 +156,8 @@ void UServerTransport::FetchChildren(TScriptInterface<ITransport> TargetTranspor
 		Request->SetVerb("POST");
 		Request->SetURL(EndPoint);
 		Request->SetHeader("Accept", TEXT("text/plain"));
-		Request->SetHeader("Authorization", "Bearer " + AuthToken);
+		if(!AuthToken.IsEmpty())
+			Request->SetHeader("Authorization","Bearer " + AuthToken);
 		Request->SetHeader("Content-Type", "application/json");
 		Request->SetContentAsString(Body);
 	}

Source/SpeckleUnreal/Public/API/ClientAPI.h

@@ -1,8 +1,8 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 
 #include "Interfaces/IHttpRequest.h"
+#include "Dom/JsonObject.h"
 
 DECLARE_DELEGATE_OneParam(FErrorDelegate, const FString&);
 DECLARE_DELEGATE_OneParam(FAPIResponceDelegate, const FString&);

Source/SpeckleUnreal/Public/API/Models/SpeckleBranch.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 
@@ -36,7 +35,7 @@ struct FSpeckleBranches
 	GENERATED_BODY();
 	
 	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
-	int32 TotalCount;
+	int32 TotalCount = 0;
 	
 	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
 	FString Cursor;

Source/SpeckleUnreal/Public/API/Models/SpeckleCollaborator.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/API/Models/SpeckleCommit.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 
@@ -56,7 +55,7 @@ struct FSpeckleCommits
 	GENERATED_BODY();
 	
 	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
-	int32 TotalCount;
+	int32 TotalCount = 0;
 	
 	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
 	FString Cursor;

Source/SpeckleUnreal/Public/API/Models/SpeckleStream.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 
@@ -28,7 +27,7 @@ struct FSpeckleStream
 	FString Description;
 
 	UPROPERTY(BlueprintReadOnly, Category="Speckle|API Models")
-	bool IsPublic;
+	bool IsPublic = false;
 
 	UPROPERTY(BlueprintReadOnly, Category="Speckle|API Models")
 	FString Role;
@@ -68,7 +67,7 @@ struct FSpeckleStreams
 	GENERATED_BODY();
 	
 	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
-	int32 TotalCount;
+	int32 TotalCount = 0;
 	
 	UPROPERTY(BlueprintReadWrite, Category="Speckle|API Models")
 	FString Cursor;

Source/SpeckleUnreal/Public/API/Models/SpeckleUser.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/API/Operations/ReceiveOperation.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/API/Operations/SpeckleStreamAPIOperation.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/API/SpeckleAPIFunctions.h

@@ -1,5 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
-
 
 #pragma once
 

Source/SpeckleUnreal/Public/API/SpeckleSerializer.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/Conversion/Converters/AggregateConverter.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/Conversion/Converters/BlockConverter.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 
@@ -10,7 +9,7 @@
 
 #include "BlockConverter.generated.h"
 
-class UBlockInstance;
+class UInstance;
 
 /**
  *  Converts Speckle Block Instance objects empty native actors with transform.
@@ -37,7 +36,7 @@ public:
 	virtual UBase* ConvertToSpeckle_Implementation(const UObject* Object) override;
 
 	UFUNCTION(BlueprintCallable, Category="ToNative")
-	virtual AActor* BlockToNative(const UBlockInstance* Block, UWorld* World);
+	virtual AActor* BlockToNative(const UInstance* Block, UWorld* World);
 	
 protected:
 	virtual AActor* CreateEmptyActor(UWorld* World, const FTransform& Transform, const FActorSpawnParameters& SpawnParameters = FActorSpawnParameters());

Source/SpeckleUnreal/Public/Conversion/Converters/MaterialConverter.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/Conversion/Converters/PointCloudConverter.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/Conversion/Converters/ProceduralMeshConverter.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/Conversion/Converters/StaticMeshConverter.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 
@@ -30,6 +29,9 @@ class SPECKLEUNREAL_API UStaticMeshConverter : public UObject, public ISpeckleCo
 
 public:
 	
+	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="ToNative")
+	TSet<FString> HiddenTypes; 
+	
 	UPROPERTY(EditAnywhere, BlueprintReadWrite, Category="ToNative")
 	TSubclassOf<AActor> MeshActorType;
 	

Source/SpeckleUnreal/Public/Conversion/SpeckleConverter.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/Conversion/SpeckleConverterComponent.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 
@@ -12,6 +11,7 @@ class ITransport;
 class ISpeckleConverter;
 class UBase;
 class UAggregateConverter;
+class FJsonValue;
 struct FSlowTask;
 
 /**

Source/SpeckleUnreal/Public/LogSpeckle.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 #include "CoreMinimal.h"

Source/SpeckleUnreal/Public/Mixpanel.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 
@@ -16,6 +15,6 @@ protected:
 public:
 	static void TrackEvent(const FString& Server, const FString& EventName);
 	static void TrackEvent(const FString& Server, const FString& EventName, const TMap<FString, FString>& CustomProperties);
-	static void TrackEvent(const FString& Email, const FString& Server, const FString& EventName, const TMap<FString, FString>& CustomProperties);
+	static void TrackEvent(const FString& UserID, const FString& Server, const FString& EventName, const TMap<FString, FString>& CustomProperties);
 	static FString Hash(const FString& Input);
 };

Source/SpeckleUnreal/Public/Objects/Base.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 
@@ -13,7 +12,7 @@ class ASpeckleUnrealManager;
 /**
  * Base type that all Object Models inherit from
  */
-UCLASS(BlueprintType, meta=(DisplayName="Base (Speckle.Objects)"))
+UCLASS(BlueprintType, meta=(DisplayName="Speckle Object (Base)"))
 class SPECKLEUNREAL_API UBase : public UObject
 {
 public:
@@ -32,14 +31,21 @@ public:
 
 	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category="Speckle|Objects")
 	FString Id;
-	
-	TMap<FString, TSharedPtr<FJsonValue>> DynamicProperties; //TODO this won't be serialised!
 
 	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category="Speckle|Objects")
-	FString Units;
+	int64 TotalChildrenCount;
+
+	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category="Speckle|Objects")
+	FString ApplicationId;
 
 	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category="Speckle|Objects")
 	FString SpeckleType;
+
+	UPROPERTY(VisibleAnywhere, BlueprintReadWrite, Category="Speckle|Objects")
+	FString Units;
+	
+	TMap<FString, TSharedPtr<FJsonValue>> DynamicProperties; //TODO this won't be serialised!
+	
 	
 	virtual bool Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITransport> ReadTransport)
 	{
@@ -53,6 +59,8 @@ public:
 		
 		if(Obj->TryGetStringField("units", Units)) DynamicProperties.Remove("units");
 		if(Obj->TryGetStringField("speckle_type", SpeckleType)) DynamicProperties.Remove("speckle_type");
+		if(Obj->TryGetStringField("applicationId", ApplicationId)) DynamicProperties.Remove("applicationId");
+		if(Obj->TryGetNumberField("totalChildrenCount", TotalChildrenCount)) DynamicProperties.Remove("totalChildrenCount");
 
 		return IsValid;
 	}

Source/SpeckleUnreal/Public/Objects/DisplayValueElement.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 
@@ -11,7 +10,8 @@
 class UMesh;
 
 /**
- * 
+ * This class does not exist in speckle sharp,
+ * This is a type to represent objects that have displayValues
  */
 UCLASS()
 class SPECKLEUNREAL_API UDisplayValueElement : public UBase
@@ -23,7 +23,7 @@ protected:
 	
 public:
 	
-	UDisplayValueElement() : UBase(TEXT("Objects.BuiltElements")) {}
+	UDisplayValueElement() : UBase(TEXT("Objects.Other.DisplayValueElement")) {}
 	
     UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Speckle|Objects")
     TArray<UMesh*> DisplayValue;

Source/SpeckleUnreal/Public/Objects/Geometry/Mesh.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/Objects/Geometry/PointCloud.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/Objects/ObjectModelRegistry.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 
@@ -24,29 +23,40 @@ private:
 
 	static void GenerateTypeRegistry();
 
-
 public:
-
-	/// Attempts to find the closest registered TSubclassOf<UBase>
-	/// by recursively stripping away a the most specific name specifier from the given SpeckleType
-	/// until a UBase type is found or the FString is exhausted.
-	///  
-	/// Eg. with an input of "Objects.Elements.Wall"
-	/// Will first look for a registered type of "Objects.Elements.Wall"
-	///	If one is not found, will look for "Objects.Elements" etc.
-	///	Returns nullptr if none found.
-	UFUNCTION(BlueprintCallable, Category="Speckle|Objects")
-	static TSubclassOf<UBase> FindClosestType(const FString& SpeckleType);
 	
+	/**
+	 * @brief Searches for a closest registered speckle type
+	 * by recursively stripping away a the most specific name specifier from the given SpeckleType
+	 * e.g. With an input of `"Objects.BuiltElements.Wall:Objects.BuiltElements.RevitWall"` will first search for
+	 * Will first look for a registered type of `"Objects.BuiltElements.RevitWall"`, then if not found `"Objects.BuiltElements.Wall"`, then simply will use UBase
+	 * @param SpeckleType The full speckle type
+	 * @return The closest registered type
+	 */
 	UFUNCTION(BlueprintCallable, Category="Speckle|Objects")
-	static bool ParentType(const FString& Type, FString& NextType);
+	static TSubclassOf<UBase> GetAtomicType(const FString& SpeckleType);
+	
 
-	/// Attempts to find a TSubclassOf<UBase> with a UBase::SpeckleType matching the given SpeckleType param
-	///	Returns nullptr if none found.
+	// E.g. "Objects.BuiltElements.Wall:Objects.BuiltElements.RevitWall" -> "Objects.BuiltElements.RevitWall"
+	UFUNCTION(BlueprintCallable, BlueprintPure, Category="Speckle|Objects")
+	static FString GetTypeName(const FString& SpeckleType);
+
+	// E.g. "Objects.BuiltElements.Wall:Objects.BuiltElements.RevitWall" -> "RevitWall"
+	UFUNCTION(BlueprintCallable, BlueprintPure, Category="Speckle|Objects")
+	static FString GetSimplifiedTypeName(const FString& SpeckleType);
+	
+	UFUNCTION(BlueprintCallable, BlueprintPure, Category="Speckle|Objects")
+	static bool SplitSpeckleType(const FString& SpeckleType, FString& OutRemainder, FString& OutTypeName, const FString& Split = ":");
+	
+	/**
+	* @brief Attempts to find a `TSubclassOf<UBase>` with a `UBase::SpeckleType` matching the given SpeckleType param
+	 * @param TypeName 
+	 * @return the matching type or `nullptr` if none found.
+	 */
 	UFUNCTION(BlueprintCallable, Category="Speckle|Objects")
-	static TSubclassOf<UBase> GetRegisteredType(const FString& SpeckleType);
+	static TSubclassOf<UBase> GetRegisteredType(const FString& TypeName);
 
 	/// Attempts to find a TSubclassOf<UBase> with a UBase::SpeckleType matching the given SpeckleType param
 	UFUNCTION(BlueprintCallable, Category="Speckle|Objects")
-	static bool TryGetRegisteredType(const FString& SpeckleType, TSubclassOf<UBase>& OutType);
+	static bool TryGetRegisteredType(const FString& TypeName, TSubclassOf<UBase>& OutType);
 };

Source/SpeckleUnreal/Public/Objects/Other/BlockInstance.h

@@ -1,9 +1,8 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 
 #include "CoreMinimal.h"
-#include "Objects/Base.h"
+#include "Instance.h"
 
 #include "BlockInstance.generated.h"
 
@@ -11,22 +10,13 @@
  * 
  */
 UCLASS()
-class SPECKLEUNREAL_API UBlockInstance : public UBase
+class SPECKLEUNREAL_API UBlockInstance : public UInstance
 {
 	GENERATED_BODY()
 	
 public:
-
-	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Speckle|Objects")
-	FString Name;
-
-	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Speckle|Objects")
-	TArray<UBase*> Geometry;
-
-	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Speckle|Objects")
-	FMatrix Transform;
 	
-	UBlockInstance() : UBase(TEXT("Objects.Other.BlockInstance")) {}
+	UBlockInstance() : UInstance(TEXT("Objects.Other.BlockInstance")) {}
 
 	virtual bool Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITransport> ReadTransport) override;
 

Source/SpeckleUnreal/Public/Objects/Other/Instance.h

@@ -0,0 +1,32 @@
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Objects/Base.h"
+
+#include "Instance.generated.h"
+
+/**
+ * 
+ */
+UCLASS(Abstract)
+class SPECKLEUNREAL_API UInstance : public UBase
+{
+	GENERATED_BODY()
+	
+public:
+
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Speckle|Objects")
+	FString Name;
+
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Speckle|Objects")
+	TArray<UBase*> Geometry;
+
+	UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category="Speckle|Objects")
+	FMatrix Transform;
+	
+protected:
+	UInstance(const FString& SpeckleType) : UBase(SpeckleType) {}
+
+	UInstance() : UBase(TEXT("Objects.Other.BlockInstance")) {}
+};	

Source/SpeckleUnreal/Public/Objects/Other/RenderMaterial.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 
@@ -41,7 +40,7 @@ public:
 	{
 		if(!Super::Parse(Obj, ReadTransport)) return false;
 	
-		if(Obj->TryGetStringField("name", Name)) DynamicProperties.Remove("name");
+		if(!Obj->TryGetStringField("name", Name)) return false;
 		if(Obj->TryGetNumberField("opacity", Opacity)) DynamicProperties.Remove("opacity");
 		if(Obj->TryGetNumberField("metalness", Metalness)) DynamicProperties.Remove("metalness");
 		if(Obj->TryGetNumberField("roughness", Roughness)) DynamicProperties.Remove("roughness");

Source/SpeckleUnreal/Public/Objects/Other/RevitInstance.h

@@ -0,0 +1,23 @@
+
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Instance.h"
+
+#include "RevitInstance.generated.h"
+
+/**
+ * 
+ */
+UCLASS()
+class SPECKLEUNREAL_API URevitInstance : public UInstance
+{
+	GENERATED_BODY()
+	
+public:
+	
+	URevitInstance() : UInstance(TEXT("Objects.Other.Revit.RevitInstance")) {}
+
+	virtual bool Parse(const TSharedPtr<FJsonObject> Obj, const TScriptInterface<ITransport> ReadTransport) override;
+
+};

Source/SpeckleUnreal/Public/Objects/Other/View3D.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/Objects/Utils/SpeckleObjectUtils.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 
@@ -49,6 +48,10 @@ public:
 
 	// Helper function to print a json obj to console
 	static FString DisplayAsString(const FString& msg, const TSharedPtr<FJsonObject> Obj);
+
+	UFUNCTION(BlueprintCallable, Category="Speckle/ObjectUtils", BlueprintPure)
+	static FString GetFriendlyObjectName(const UBase* SpeckleObject);
 	
-	
+	UFUNCTION(BlueprintCallable, Category="Speckle/ObjectUtils", BlueprintPure)
+	static FString GetBoringObjectName(const UBase* SpeckleObject);
 };

Source/SpeckleUnreal/Public/ReceiveSelectionComponent.h

@@ -1,12 +1,13 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 
 #include "CoreMinimal.h"
+#include "Components/ActorComponent.h"
 #include "API/Models/SpeckleStream.h"
 
 #include "ReceiveSelectionComponent.generated.h"
 
+
 /**
  * Actor component for selecting a Speckle Stream + Object
  * Either by Stream Id + Object Id (Object selection mode)

Source/SpeckleUnreal/Public/SpeckleUnreal.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/SpeckleUnrealManager.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/Transports/MemoryTransport.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/Transports/ServerTransport.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/Public/Transports/Transport.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnreal/SpeckleUnreal.Build.cs

@@ -1,3 +1,4 @@
+
 using UnrealBuildTool;
 
 public class SpeckleUnreal : ModuleRules
@@ -6,9 +7,17 @@ public class SpeckleUnreal : ModuleRules
 	{
 		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
 		
-		PublicDefinitions.Add("SUPPRESS_SPECKLE_ANALYTICS=0");
-		
-		PublicIncludePaths.AddRange(
+		// #if UE_5_2_OR_LATER
+		// IWYUSupport = IWYUSupport.Full;
+		// #else 
+		// bEnforceIWYU = true;
+		// #endif
+		//
+		// bUseUnity = false;
+
+		PublicDefinitions.Add("SPECKLE_CONNECTOR_VERSION=\"2.15.0\"");
+
+        PublicIncludePaths.AddRange(
 			new string[] {
 				// ... add public include paths required here ...
 			}

Source/SpeckleUnrealEditor/Private/Conversion/ConverterFactory.cpp

@@ -1,5 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
-
 
 #include "Conversion/ConverterFactory.h"
 

Source/SpeckleUnrealEditor/Private/SpeckleUnrealEditorModule.cpp

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #include "SpeckleUnrealEditorModule.h"
 
@@ -34,7 +33,8 @@ void FSpeckleUnrealEditorModule::StartupModule()
 
 			// Create FConverterActions for USpeckleConverter types
 			if ( Class->ImplementsInterface(USpeckleConverter::StaticClass())
-				&& !Class->HasAnyClassFlags(CLASS_Abstract))
+				&& !Class->HasAnyClassFlags(CLASS_Abstract)
+				&& !Class->GetFName().ToString().Contains(TEXT("REINST"))) //Ignore hot-reloaded BPs
 			{
 				AssetTools.RegisterAssetTypeActions(MakeShareable(new FConverterActions(Class, SpeckleAssetCategoryBit)));
 			}

Source/SpeckleUnrealEditor/Public/Conversion/ConverterActions.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnrealEditor/Public/Conversion/ConverterFactory.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnrealEditor/Public/InterfaceClassFilter.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnrealEditor/Public/SpeckleUnrealEditorModule.h

@@ -1,4 +1,3 @@
-// Copyright 2022 AEC Systems, Licensed under the Apache License, Version 2.0
 
 #pragma once
 

Source/SpeckleUnrealEditor/SpeckleUnrealEditor.Build.cs

@@ -1,3 +1,4 @@
+
 using UnrealBuildTool;
 
 public class SpeckleUnrealEditor : ModuleRules

SpeckleUnreal.uplugin

@@ -1,7 +1,7 @@
 {
 	"FileVersion": 3,
 	"Version": 1,
-	"VersionName": "2.7.0",
+	"VersionName": "2.15.0",
 	"FriendlyName": "Speckle Unreal",
 	"Description": "Speckle is an open source data platform for Architecture, Engineering, and Construction. It has been open sourced under the Apache License 2.0, is customizable, and available in the cloud or via a self-hosted server. It allows users to exchange data between various AEC modelling and content creation platforms.",
 	"Category": "AEC",