merge in develop

mediumTaj · mediumTaj · commit 29aa198e6ab8 · 2016-06-08T09:58:30.000-05:00
diff --git a/Scripts/Camera/WatsonCamera.cs b/Scripts/Camera/WatsonCamera.cs
@@ -121,15 +121,15 @@ public CameraTarget DefaultCameraTarget
 
         #region Event Registration
 
-        void OnEnable()
+        protected virtual void OnEnable()
         {
             EventManager.Instance.RegisterEventReceiver("OnCameraReset", ResetCameraPosition);
             EventManager.Instance.RegisterEventReceiver("OnCameraSetAntiAliasing", OnCameraSetAntiAliasing);
             EventManager.Instance.RegisterEventReceiver("OnCameraSetDepthOfField", OnCameraSetDepthOfField);
             EventManager.Instance.RegisterEventReceiver("OnCameraSetInteractivity", OnCameraSetTwoFingerDrag);
         }
 
-        void OnDisable()
+        protected virtual void OnDisable()
         {
             EventManager.Instance.UnregisterEventReceiver("OnCameraReset", ResetCameraPosition);
             EventManager.Instance.UnregisterEventReceiver("OnCameraSetAntiAliasing", OnCameraSetAntiAliasing);

Original file line number	Diff line number	Diff line change
`@@ -121,15 +121,15 @@ public CameraTarget DefaultCameraTarget`
`121`	`121`
`122`	`122`	`#region Event Registration`
`123`	`123`
`124`		`- void OnEnable()`
	`124`	`+ protected virtual void OnEnable()`
`125`	`125`	`{`
`126`	`126`	`EventManager.Instance.RegisterEventReceiver("OnCameraReset", ResetCameraPosition);`
`127`	`127`	`EventManager.Instance.RegisterEventReceiver("OnCameraSetAntiAliasing", OnCameraSetAntiAliasing);`
`128`	`128`	`EventManager.Instance.RegisterEventReceiver("OnCameraSetDepthOfField", OnCameraSetDepthOfField);`
`129`	`129`	`EventManager.Instance.RegisterEventReceiver("OnCameraSetInteractivity", OnCameraSetTwoFingerDrag);`
`130`	`130`	`}`
`131`	`131`
`132`		`- void OnDisable()`
	`132`	`+ protected virtual void OnDisable()`
`133`	`133`	`{`
`134`	`134`	`EventManager.Instance.UnregisterEventReceiver("OnCameraReset", ResetCameraPosition);`
`135`	`135`	`EventManager.Instance.UnregisterEventReceiver("OnCameraSetAntiAliasing", OnCameraSetAntiAliasing);`