fix merge conflicts

Author: Bvallon-sl

ZEDCamera/Assets/ZED/Examples/Drone Shooter/Scenes/DroneBattle.unity

@@ -154,47 +154,6 @@ PrefabInstance:
     - target: {fileID: 4309805032874704, guid: e13ee7e0790c7d243b7aa67fe604acac, type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
-<<<<<<< HEAD
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  spreadCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 0
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-  reverbZoneMixCustomCurve:
-    serializedVersion: 2
-    m_Curve:
-    - serializedVersion: 3
-      time: 0
-      value: 1
-      inSlope: 0
-      outSlope: 0
-      tangentMode: 0
-      weightedMode: 0
-      inWeight: 0.33333334
-      outWeight: 0.33333334
-    m_PreInfinity: 2
-    m_PostInfinity: 2
-    m_RotationOrder: 4
-=======
       objectReference: {fileID: 0}
     - target: {fileID: 4309805032874704, guid: e13ee7e0790c7d243b7aa67fe604acac, type: 3}
       propertyPath: m_LocalPosition.z
@@ -329,7 +288,6 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e13ee7e0790c7d243b7aa67fe604acac, type: 3}
->>>>>>> 96ee8b6e83f19980efce3f521c262ff86b85f93a
 --- !u!4 &741507345 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 4138687653623062, guid: e13ee7e0790c7d243b7aa67fe604acac,
@@ -351,26 +309,13 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 133b3bfe60baacd45a72714ffc6eb29a, type: 3}
-<<<<<<< HEAD
-  m_Name:
-  m_EditorClassIdentifier:
-=======
   m_Name:
   m_EditorClassIdentifier:
->>>>>>> 96ee8b6e83f19980efce3f521c262ff86b85f93a
   deviceToTrack: 0
   latencyCompensation: 78
   correctControllerDrift: 1
   SNHolder:
   zedManager: {fileID: 1344833222}
-<<<<<<< HEAD
-  fireButton: 2
-  clickButton: 2
-  backButton: 8
-  grabButton: 3
-  navigateUIAxis: 10
-=======
->>>>>>> 96ee8b6e83f19980efce3f521c262ff86b85f93a
   onFireDown:
     m_PersistentCalls:
       m_Calls: []
@@ -410,13 +355,6 @@ PrefabInstance:
       propertyPath: m_RootOrder
       value: 3
       objectReference: {fileID: 0}
-<<<<<<< HEAD
-    - target: {fileID: 4937924797587290, guid: d0ab09dfdb72e614aadbc6e474b9bc3e, type: 3}
-      propertyPath: m_RootOrder
-      value: 3
-      objectReference: {fileID: 0}
-=======
->>>>>>> 96ee8b6e83f19980efce3f521c262ff86b85f93a
     - target: {fileID: 4937924797587290, guid: d0ab09dfdb72e614aadbc6e474b9bc3e, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0

ZEDCamera/Assets/ZED/Examples/Object Detection/Scenes/3D Object Detection.unity

@@ -289,14 +289,11 @@ PrefabInstance:
     - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42,
         type: 3}
       propertyPath: objectDetectionFoldoutOpen
-<<<<<<< HEAD
-=======
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42,
         type: 3}
       propertyPath: objectDetectionImageSyncMode
->>>>>>> 96ee8b6e83f19980efce3f521c262ff86b85f93a
       value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 114491592745282986, guid: 76db3eb81fd21ae45bab5204e324ae42,

ZEDCamera/Assets/ZED/Examples/SkeletonTracking/Prefabs/Avatar/Avatar_mat.mat

@@ -7,15 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-<<<<<<< HEAD
-<<<<<<< HEAD:ZEDCamera/Assets/ZED/Examples/SkeletonTracking/Prefabs/Avatar/Avatar_mat.mat
   m_Name: Avatar_mat
-=======
-  m_Name: Default
->>>>>>> 96ee8b6e83f19980efce3f521c262ff86b85f93a:ZEDCamera/Assets/ZED/Examples/SimpleMR/Materials/Default.mat
-=======
-  m_Name: Avatar_mat
->>>>>>> 96ee8b6e83f19980efce3f521c262ff86b85f93a
   m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
   m_ShaderKeywords: 
   m_LightmapFlags: 4
@@ -83,7 +75,3 @@ Material:
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-<<<<<<< HEAD
-  m_BuildTextureStacks: []
-=======
->>>>>>> 96ee8b6e83f19980efce3f521c262ff86b85f93a

ZEDCamera/Assets/ZED/SDK/Helpers/Scripts/ZEDManager.cs

@@ -2177,8 +2177,6 @@ private void AcquireImages()
     {
         if (requestNewFrame && zedReady)
         {
-            ZEDGrabError = sl.ERROR_CODE.FAILURE;
-
             if (inputType == sl.INPUT_TYPE.INPUT_TYPE_SVO)
             {
                 //handle pause