From df1319a63eedebbfa9232b8f5f7cf579b4b31fbf Mon Sep 17 00:00:00 2001
From: Gregory Labute <gregoryl@unity3d.com>
Date: Thu, 30 May 2024 17:04:00 -0400
Subject: [PATCH] merge conflicts

---
 .../Icons/CmSplineLookAtTargetsTool@256.png   | Bin 6133 -> 0 bytes
 .../CmSplineLookAtTargetsTool@256.png.meta    | 114 ------------------
 .../Icons/CmSplineRollTool@256.png            | Bin 7756 -> 0 bytes
 .../Icons/CmSplineRollTool@256.png.meta       | 114 ------------------
 .../Utility/CinemachineToolbarOverlay.cs.meta |  11 --
 5 files changed, 239 deletions(-)
 delete mode 100644 com.unity.cinemachine/Editor/EditorResources/Icons/CmSplineLookAtTargetsTool@256.png
 delete mode 100644 com.unity.cinemachine/Editor/EditorResources/Icons/CmSplineLookAtTargetsTool@256.png.meta
 delete mode 100644 com.unity.cinemachine/Editor/EditorResources/Icons/CmSplineRollTool@256.png
 delete mode 100644 com.unity.cinemachine/Editor/EditorResources/Icons/CmSplineRollTool@256.png.meta
 delete mode 100644 com.unity.cinemachine/Editor/Utility/CinemachineToolbarOverlay.cs.meta

diff --git a/com.unity.cinemachine/Editor/EditorResources/Icons/CmSplineLookAtTargetsTool@256.png b/com.unity.cinemachine/Editor/EditorResources/Icons/CmSplineLookAtTargetsTool@256.png
deleted file mode 100644
index fdf0bf74b7dd3acd475d0a19c611bd4a2d189848..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6133
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
CSUVK}

diff --git a/com.unity.cinemachine/Editor/EditorResources/Icons/CmSplineLookAtTargetsTool@256.png.meta b/com.unity.cinemachine/Editor/EditorResources/Icons/CmSplineLookAtTargetsTool@256.png.meta
deleted file mode 100644
index b82638cf4..000000000
--- a/com.unity.cinemachine/Editor/EditorResources/Icons/CmSplineLookAtTargetsTool@256.png.meta
+++ /dev/null
@@ -1,114 +0,0 @@
-fileFormatVersion: 2
-guid: 1bd775b0c715bb74b9d0d16454da164d
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/com.unity.cinemachine/Editor/EditorResources/Icons/CmSplineRollTool@256.png b/com.unity.cinemachine/Editor/EditorResources/Icons/CmSplineRollTool@256.png
deleted file mode 100644
index 51db5e28877fce8ab97017bf2b3deb8dc3e578a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7756
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

diff --git a/com.unity.cinemachine/Editor/EditorResources/Icons/CmSplineRollTool@256.png.meta b/com.unity.cinemachine/Editor/EditorResources/Icons/CmSplineRollTool@256.png.meta
deleted file mode 100644
index 02aac5ba9..000000000
--- a/com.unity.cinemachine/Editor/EditorResources/Icons/CmSplineRollTool@256.png.meta
+++ /dev/null
@@ -1,114 +0,0 @@
-fileFormatVersion: 2
-guid: af98f166dae35a14190b6909eed26efb
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 12
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-    flipGreenChannel: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  vTOnly: 0
-  ignoreMipmapLimit: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: 1
-    aniso: 1
-    mipBias: 0
-    wrapU: 0
-    wrapV: 0
-    wrapW: 0
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  flipbookRows: 1
-  flipbookColumns: 1
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  ignorePngGamma: 0
-  applyGammaDecoding: 0
-  swizzle: 50462976
-  cookieLightType: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    ignorePlatformSupport: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-    nameFileIdTable: {}
-  mipmapLimitGroupName: 
-  pSDRemoveMatte: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/com.unity.cinemachine/Editor/Utility/CinemachineToolbarOverlay.cs.meta b/com.unity.cinemachine/Editor/Utility/CinemachineToolbarOverlay.cs.meta
deleted file mode 100644
index ef9e8cc5e..000000000
--- a/com.unity.cinemachine/Editor/Utility/CinemachineToolbarOverlay.cs.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: fdfe64f027e0b40ffa59a87a23ac5eeb
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: