diff --git a/.gitignore b/.gitignore index 2967afea..04b96fa5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,6 @@ Assets/blend/scene.blend1 Assets/blend/khafile.js Assets/blend/build_scene Assets/blend/Sources +Assets/blend/Bundled *.pyc *.DS_Store diff --git a/Assets/blend/scene.blend b/Assets/blend/scene.blend index 746c8ead..0130f9d2 100644 Binary files a/Assets/blend/scene.blend and b/Assets/blend/scene.blend differ diff --git a/compiled/Shaders/compiled.inc b/compiled/Shaders/compiled.inc index 70de4aa5..bcabfe82 100644 --- a/compiled/Shaders/compiled.inc +++ b/compiled/Shaders/compiled.inc @@ -2,6 +2,11 @@ #define _COMPILED_GLSL_ #define _EnvTex #define _EnvStr +#define _CGrainStatic +#define _Emission +#define _Brdf +#define _Irr +#define _Rad #define _Irr #define _EnvStr #define _MicroShadowing @@ -14,11 +19,6 @@ #define _Veloc #define _SSAO #define _gbuffer2 -#define _CGrainStatic -#define _Emission -#define _Brdf -#define _Irr -#define _Rad #define _CToneFilmic #define _CVignette const float PI = 3.1415926535;