Integrating up through commit 90f050496

Code/Sandbox/Editor/Include/Command.h

@@ -768,12 +768,12 @@ QString CCommand6<LIST(6, P)>::Execute(const CCommand::CArgs& args)
         return "";
     }
 
-    P1 p1;
-    P2 p2;
-    P3 p3;
-    P4 p4;
-    P5 p5;
-    P6 p6;
+    P1 p1 = 0;
+    P2 p2 = 0;
+    P3 p3 = 0;
+    P4 p4 = 0;
+    P5 p5 = 0;
+    P6 p6 = 0;
     bool ok = FromString_(p1, args.GetArg(0).c_str())
         && FromString_(p2, args.GetArg(1).c_str())
         && FromString_(p3, args.GetArg(2).c_str())
@@ -782,9 +782,7 @@ QString CCommand6<LIST(6, P)>::Execute(const CCommand::CArgs& args)
         && FromString_(p6, args.GetArg(5).c_str());
     if (ok)
     {
-        AZ_PUSH_DISABLE_WARNING(4703, "-Wunknown-warning-option")
         m_functor(p1, p2, p3, p4, p5, p6);
-        AZ_POP_DISABLE_WARNING
     }
     else
     {

Code/Sandbox/Editor/Include/ObjectEvent.h

@@ -43,8 +43,6 @@ enum ObjectEvent
     EVENT_PHYSICS_RESETSTATE,//!< Signals that physics state must be reseted on objects.
     EVENT_PHYSICS_APPLYSTATE,//!< Signals that the stored physics state must be applied to objects.
 
-    EVENT_PRE_EXPORT, //!< Signals that the game is about to be exported, prepare any data if the object needs to
-
     EVENT_FREE_GAME_DATA,//!< Object should free game data that its holding.
     EVENT_CONFIG_SPEC_CHANGE,   //!< Called when config spec changed.
     EVENT_HIDE_HELPER, //!< Signals that happens when Helper mode switches to be hidden.