1 files changed, 4 insertions, 3 deletions
diff --git a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/SharedVariables/SetSharedGameObject.cs b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/SharedVariables/SetSharedGameObject.cs
index 7db27528..ac7f7540 100644
--- a/Client/Assets/Behavior Designer/Runtime/Basic Tasks/SharedVariables/SetSharedGameObject.cs
+++ b/Client/Assets/Behavior Designer/Runtime/Basic Tasks/SharedVariables/SetSharedGameObject.cs
@@ -1,5 +1,3 @@
-using UnityEngine;
-
 namespace BehaviorDesigner.Runtime.Tasks.Basic.SharedVariables
 {
     [TaskCategory("Basic/SharedVariable")]
@@ -11,16 +9,19 @@ namespace BehaviorDesigner.Runtime.Tasks.Basic.SharedVariables
         [RequiredField]
         [Tooltip("The SharedGameObject to set")]
         public SharedGameObject targetVariable;
+        [Tooltip("Can the target value be null?")]
+        public SharedBool valueCanBeNull;
 
         public override TaskStatus OnUpdate()
         {
-            targetVariable.Value = (targetValue.Value != null ? targetValue.Value : gameObject);
+            targetVariable.Value = ((targetValue.Value != null || valueCanBeNull.Value) ? targetValue.Value : gameObject);
 
             return TaskStatus.Success;
         }
 
         public override void OnReset()
         {
+            valueCanBeNull = false;
             targetValue = null;
             targetVariable = null;
         }