Merge branch 'feature/brush-size-slider' into feature/logitech-ink-su…

…pport # Conflicts: # Assets/Prefabs/Panels/BrushesPanel.prefab # Assets/Prefabs/Panels/Widgets/AdvancedSliderV.prefab # Assets/Prefabs/UIComponents/BrushSettingsTray.prefab # Assets/Scripts/GUI/BrushSettingsTray.cs
icosa-foundation · Sep 8, 2024 · 91a2024 · 91a2024
2 parents 4d875bf + d36ec4f
commit 91a2024
Show file tree

Hide file tree

Showing 21 changed files with 2,760 additions and 119 deletions.
diff --git a/Assets/Prefabs/Panels/BrushesPanel.prefab b/Assets/Prefabs/Panels/BrushesPanel.prefab
@@ -5076,11 +5076,11 @@ PrefabInstance:
  objectReference: {fileID: 0}
  - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3}
  propertyPath: m_LocalPosition.y
- value: 0.145
+ value: -0.26
  objectReference: {fileID: 0}
  - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3}
  propertyPath: m_LocalPosition.z
- value: 0.006
+ value: 0.04
  objectReference: {fileID: 0}
  - target: {fileID: 4073457010706892, guid: ef594e7ddc7909f429747f1ebbe8af90, type: 3}
  propertyPath: m_LocalRotation.w