more changes

some stuff didn't make any sense
jotakob · Nov 6, 2015 · 260274c · 260274c
1 parent a9dd8b0
commit 260274c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/Prototype/.vs/Prototype/v14/.suo b/Prototype/.vs/Prototype/v14/.suo
diff --git a/Prototype/Assets/Scenes/Testing.unity b/Prototype/Assets/Scenes/Testing.unity
diff --git a/Prototype/Assets/Scripts/GrabObject.cs b/Prototype/Assets/Scripts/GrabObject.cs
@@ -49,7 +49,7 @@ void OnTriggerEnter(Collider other)
 			gameObject.isStatic = true;
 			otherPad.GetComponent<GrabObject>().setDownOneOccupied = true;
 			AEDTrigger.GetComponent<ActivateAED>().placedOne = true;
-			otherPad.GetComponent<GrabObject>().enabled = true;
+			//otherPad.GetComponent<GrabObject>().enabled = true;
 		}
 
 		Vector3 setDownPosition2 = setDown2.transform.position;
@@ -62,7 +62,7 @@ void OnTriggerEnter(Collider other)
 			gameObject.isStatic = true;
 			otherPad.GetComponent<GrabObject>().setDownTwoOccupied = true;
 			AEDTrigger.GetComponent<ActivateAED>().placedTwo = true;
-			otherPad.GetComponent<GrabObject>().enabled = true;
+			//otherPad.GetComponent<GrabObject>().enabled = true;
 		}
 
 	}