Merge branch '3.0_work'

# Conflicts:
#	src/gl/scene/gl_portal.cpp
#	src/r_plane.cpp

src/scripting/backend/scopebarrier.h

@@ -2,6 +2,9 @@
 
 #include "zstring.h"
 
+class PClass;
+class VMFunction;
+
 //
 // [ZZ] this really should be in codegen.h, but vmexec needs to access it
 struct FScopeBarrier