Shader include fixes

Shaders/std/dof.glsl

@@ -1,8 +1,8 @@
 // DoF with bokeh GLSL shader by Martins Upitis (martinsh) (devlog-martinsh.blogspot.com)
 // Creative Commons Attribution 3.0 Unported License
 
-#include "../compiled.glsl"
-#include "math.glsl"
+#include "compiled.glsl"
+#include "std/math.glsl"
 
 // const float compoDOFDistance = 10.0; // Focal distance value in meters
 // const float compoDOFLength = 160.0; // Focal length in mm 18-200

Shaders/std/gbuffer.glsl

@@ -1,8 +1,6 @@
 #ifndef _GBUFFER_GLSL_
 #define _GBUFFER_GLSL_
 
-#include "../compiled.glsl"
-
 vec2 octahedronWrap(const vec2 v) {
 	return (1.0 - abs(v.yx)) * (vec2(v.x >= 0.0 ? 1.0 : -1.0, v.y >= 0.0 ? 1.0 : -1.0));
 }

Shaders/std/shadows.glsl

@@ -1,4 +1,4 @@
-#include "../compiled.glsl"
+#include "compiled.glsl"
 
 uniform sampler2D shadowMap;
 uniform samplerCube shadowMapCube;

Shaders/std/ssrs.glsl

@@ -1,4 +1,4 @@
-#include "gbuffer.glsl"
+#include "std/gbuffer.glsl"
 
 uniform mat4 VP;
 

Shaders/std/sss.glsl

@@ -1,6 +1,4 @@
 
-#include "../compiled.glsl"
-
 // Separable SSS Transmittance Function, ref to sss_pass
 vec3 SSSSTransmittance(mat4 LWVP, vec3 p, vec3 n, vec3 l, float lightFar, sampler2D shadowMap) {
 	const float translucency = 1.0;

blender/arm/make_renderpath.py

@@ -41,7 +41,7 @@ def build():
             compo_depth = False
             if wrd.arm_tonemap != 'Off':
                 wrd.compo_defs = '_CTone' + wrd.arm_tonemap
-            if rpdat.rp_antialiasing != 'Off':
+            if rpdat.rp_antialiasing == 'FXAA':
                 wrd.compo_defs += '_CFXAA'
             if wrd.arm_letterbox:
                 wrd.compo_defs += '_CLetterbox'