[Bf-blender-cvs] [44e8045] viewport_experiments: Merge branch 'master' into viewport_experiments

[Antony Riakiotakis]

Commit: 44e8045ee5064a5e9d89d7654a28bf69f1771966
Author: Antony Riakiotakis
Date:   Fri Dec 5 23:32:07 2014 +0100
Branches: viewport_experiments
https://developer.blender.org/rB44e8045ee5064a5e9d89d7654a28bf69f1771966

Merge branch 'master' into viewport_experiments

===================================================================



===================================================================

diff --cc source/blender/editors/render/render_opengl.c
index 7266f5e,7df281b..bf3e0d4
--- a/source/blender/editors/render/render_opengl.c
+++ b/source/blender/editors/render/render_opengl.c
@@@ -70,9 -68,7 +70,8 @@@
  
  #include "GPU_extensions.h"
  #include "GPU_glew.h"
 +#include "GPU_compositing.h"
  
- #include "wm_window.h"
  
  #include "render_intern.h"
  
diff --cc source/blender/gpu/intern/gpu_extensions.c
index ff322d8,e386869..6090f34
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@@ -47,10 -47,8 +47,9 @@@
  
  #include "GPU_draw.h"
  #include "GPU_extensions.h"
 +#include "GPU_compositing.h"
  #include "GPU_simple_shader.h"
  
- #include "intern/gpu_codegen.h"
  #include "intern/gpu_extensions_private.h"
  
  #include <stdlib.h>