Fix bugged preset state on soft cut

This explains that redi jedi's presets (or other, for example, gedit imp fiShbRaiN + geiss - witchcraft...) will not parse the state correctly when doing a soft cut.
This commit fixes it.

Author: OfficialIncubo

vis_milk2/plugin.cpp

@@ -10052,7 +10052,10 @@ void CPlugin::LoadPreset(const wchar_t *szPresetFilename, float fBlendTime)
         ApplyFlags ^= (m_bWarpShaderLock ? STATE_WARP : 0);
         ApplyFlags ^= (m_bCompShaderLock ? STATE_COMP : 0);
 
-        m_pNewState->Import(szPresetFilename, GetTime(), m_pOldState, ApplyFlags);
+        // Import locked/omitted sections from the preset currently on screen.
+        // m_pOldState is the spare state here and may belong to an earlier
+        // preset, which makes soft cuts inherit stale code and parameters.
+        m_pNewState->Import(szPresetFilename, GetTime(), m_pState, ApplyFlags);
 
         m_nLoadingPreset = 1;   // this will cause LoadPresetTick() to get called over the next few frames...
 

vis_milk2/state.cpp

@@ -1779,7 +1779,10 @@ void CState::RecompileExpressions(int flags, int bReInit)
 			    {
 				    // now execute the code, save the values of q1..q32, and clean up the code!
 
-                    g_plugin.LoadPerFrameEvallibVars(g_plugin.m_pState);
+                    // This state may be compiled asynchronously as m_pNewState.
+                    // Populate the variables for the state being initialized,
+                    // rather than whichever state is currently on screen.
+                    g_plugin.LoadPerFrameEvallibVars(this);
 
 				    NSEEL_code_execute(pf_codehandle_init);
 
@@ -1845,7 +1848,7 @@ void CState::RecompileExpressions(int flags, int bReInit)
 			            {
 				            // now execute the code, save the values of t1..t8, and clean up the code!
 
-                            g_plugin.LoadCustomWavePerFrameEvallibVars(g_plugin.m_pState, i);
+                            g_plugin.LoadCustomWavePerFrameEvallibVars(this, i);
                                 // note: q values at this point will actually be same as
                                 //       q_values_after_init_code[], since no per-frame code
                                 //       has actually been executed yet!
@@ -1916,7 +1919,7 @@ void CState::RecompileExpressions(int flags, int bReInit)
 			            {
 				            // now execute the code, save the values of q1..q8, and clean up the code!
 
-                            g_plugin.LoadCustomShapePerFrameEvallibVars(g_plugin.m_pState, i, 0);
+                            g_plugin.LoadCustomShapePerFrameEvallibVars(this, i, 0);
                                 // note: q values at this point will actually be same as
                                 //       q_values_after_init_code[], since no per-frame code
                                 //       has actually been executed yet!