Merge remote-tracking branch 'origin/main' into upgrade-feature-metadata

CHANGES.md

@@ -21,11 +21,16 @@
 - `CesiumMetadata` has been deprecated. Instead, retrieve the `CesiumModelMetadata` component attached to a tile game object in order to access its glTF metadata.
 - `CesiumFeature` has been deprecated. Instead, retrieve feature IDs from the `CesiumPrimitiveFeatures` component attached to a primitive game object in order to access its glTF features. Feature IDs can be used to retrieve metadata from the `CesiumModelMetadata` attached to its parent.
 
+##### Fixes :wrench:
+
+- Removed Universal Additional Camera Data script from DynamicCamera prefab, as it shows up as a missing script in other render pipelines.
+
 ### v1.7.1 - 2023-12-14
 
 ##### Fixes :wrench:
 
 - Fixed a bug that prevented the default `CesiumIonServer` asset from remembering its token in a clean project.
+- Fixed "DynamicCamera is not nested inside a game object with a CesiumGeoreference" warning when adding a new DynamicCamera in the editor.
 
 ### v1.7.0 - 2023-12-14
 

Editor/CesiumEditorUtility.cs

@@ -329,9 +329,8 @@ public static CesiumCameraController CreateDynamicCamera()
 
             GameObject dynamicCameraPrefab = Resources.Load<GameObject>("DynamicCamera");
             GameObject dynamicCameraObject =
-                UnityEngine.Object.Instantiate(dynamicCameraPrefab);
+                UnityEngine.Object.Instantiate(dynamicCameraPrefab, georeference.gameObject.transform);
             dynamicCameraObject.name = "DynamicCamera";
-            dynamicCameraObject.transform.parent = georeference.gameObject.transform;
 
             Undo.RegisterCreatedObjectUndo(dynamicCameraObject, "Create DynamicCamera");
 

Runtime/Resources/DynamicCamera.prefab

@@ -11,7 +11,6 @@ GameObject:
   - component: {fileID: 5627069538230183851}
   - component: {fileID: 5627069538230183848}
   - component: {fileID: 5627069538230183849}
-  - component: {fileID: 5627069538230183850}
   - component: {fileID: 7346015802769307894}
   - component: {fileID: 7574593196070563001}
   - component: {fileID: 1447381297153131539}
@@ -89,39 +88,6 @@ AudioListener:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5627069538230183846}
   m_Enabled: 1
---- !u!114 &5627069538230183850
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5627069538230183846}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_RenderShadows: 1
-  m_RequiresDepthTextureOption: 2
-  m_RequiresOpaqueTextureOption: 2
-  m_CameraType: 0
-  m_Cameras: []
-  m_RendererIndex: -1
-  m_VolumeLayerMask:
-    serializedVersion: 2
-    m_Bits: 1
-  m_VolumeTrigger: {fileID: 0}
-  m_VolumeFrameworkUpdateModeOption: 2
-  m_RenderPostProcessing: 1
-  m_Antialiasing: 0
-  m_AntialiasingQuality: 2
-  m_StopNaN: 0
-  m_Dithering: 0
-  m_ClearDepth: 1
-  m_AllowXRRendering: 1
-  m_RequiresDepthTexture: 0
-  m_RequiresColorTexture: 0
-  m_Version: 2
 --- !u!114 &7346015802769307894
 MonoBehaviour:
   m_ObjectHideFlags: 0