Jelajahi Sumber

fix bad merge, restore whats new entries

Nicholas Barlow 5 tahun lalu
induk
melakukan
587ed49685
1 mengubah file dengan 6 tambahan dan 0 penghapusan
  1. 6 0
      dist/preview release/what's new.md

+ 6 - 0
dist/preview release/what's new.md

@@ -41,7 +41,13 @@
 - Fix picking issue in the Solid Particle System when MultiMaterial is enabled ([jerome](https://github.com/jbousquie))
 - Fix picking issue in the Solid Particle System when MultiMaterial is enabled ([jerome](https://github.com/jbousquie))
 - `QuadraticErrorSimplification` was not exported ([RaananW](https://github.com/Raananw)
 - `QuadraticErrorSimplification` was not exported ([RaananW](https://github.com/Raananw)
 - Fix NME Frames bug where collapsing and moving a frame removed the nodes inside ([Kyle Belfort](https://github.com/belfortk)
 - Fix NME Frames bug where collapsing and moving a frame removed the nodes inside ([Kyle Belfort](https://github.com/belfortk)
+<<<<<<< HEAD
 - Remove texture baking from `KHR_texture_transform` serializer. ([drigax](https://github.com/Drigax))
 - Remove texture baking from `KHR_texture_transform` serializer. ([drigax](https://github.com/Drigax))
+=======
+- Fix moving / disappearing controls when freezing/unfreezing the ScrollViewer ([Popov72](https://github.com/Popov72)
+- Fix: when using instances, master mesh (if displayed) does not have correct instance buffer values ([Popov72](https://github.com/Popov72)
+- Fix improper baking of transformed textures in `KHR_texture_transform` serializer. ([drigax](https://github.com/Drigax))
+>>>>>>> ee255573c14b962e47b0e9c602180d5a8e206c34
 
 
 
 
 ## Breaking changes
 ## Breaking changes