GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 1.9

Browse Source 
# Conflicts:
#	Source/Engine/UI/GUI/Common/Button.cs
This commit is contained in:
Wojtek Figat
2024-09-23 14:11:05 +02:00
parent da5570e89f 371e16a857
commit 18dc475f40
59 changed files with 675 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Editor/CustomEditors/Editors/Vector2Editor.cs
View File

@@ -69,7 +69,7 @@ namespace FlaxEditor.CustomEditors.Editors
private void OnValueChanged()
{
if (IsSetBlocked)
if (IsSetBlocked || Values == null)
return;
var isSliding = XElement.IsSliding || YElement.IsSliding;
@@ -158,7 +158,7 @@ namespace FlaxEditor.CustomEditors.Editors
private void OnValueChanged()
{
if (IsSetBlocked)
if (IsSetBlocked || Values == null)
return;
var isSliding = XElement.IsSliding || YElement.IsSliding;
@@ -247,7 +247,7 @@ namespace FlaxEditor.CustomEditors.Editors
private void OnValueChanged()
{
if (IsSetBlocked)
if (IsSetBlocked || Values == null)
return;
var isSliding = XElement.IsSliding || YElement.IsSliding;

6
Source/Editor/CustomEditors/Editors/Vector3Editor.cs
View File

@@ -143,7 +143,7 @@ namespace FlaxEditor.CustomEditors.Editors
private void OnValueChanged()
{
if (IsSetBlocked)
if (IsSetBlocked || Values == null)
return;
var xValue = XElement.ValueBox.Value;
@@ -318,7 +318,7 @@ namespace FlaxEditor.CustomEditors.Editors
private void OnValueChanged()
{
if (IsSetBlocked)
if (IsSetBlocked || Values == null)
return;
var isSliding = XElement.IsSliding || YElement.IsSliding || ZElement.IsSliding;
@@ -418,7 +418,7 @@ namespace FlaxEditor.CustomEditors.Editors
private void OnValueChanged()
{
if (IsSetBlocked)
if (IsSetBlocked || Values == null)
return;
var isSliding = XElement.IsSliding || YElement.IsSliding || ZElement.IsSliding;

6
Source/Editor/CustomEditors/Editors/Vector4Editor.cs
View File

@@ -89,7 +89,7 @@ namespace FlaxEditor.CustomEditors.Editors
private void OnValueChanged()
{
if (IsSetBlocked)
if (IsSetBlocked || Values == null)
return;
var isSliding = XElement.IsSliding || YElement.IsSliding || ZElement.IsSliding || WElement.IsSliding;
@@ -200,7 +200,7 @@ namespace FlaxEditor.CustomEditors.Editors
private void OnValueChanged()
{
if (IsSetBlocked)
if (IsSetBlocked || Values == null)
return;
var isSliding = XElement.IsSliding || YElement.IsSliding || ZElement.IsSliding || WElement.IsSliding;
@@ -311,7 +311,7 @@ namespace FlaxEditor.CustomEditors.Editors
private void OnValueChanged()
{
if (IsSetBlocked)
if (IsSetBlocked || Values == null)
return;
var isSliding = XElement.IsSliding || YElement.IsSliding || ZElement.IsSliding || WElement.IsSliding;