[Bf-blender-cvs] [5c31594] viewport_experiments: Merge branch 'master' into viewport_experiments

[Antony Riakiotakis]

Commit: 5c31594ab77ca75c95fff6f651c75e4b7075ce4d
Author: Antony Riakiotakis
Date:   Mon Oct 20 18:56:00 2014 +0200
Branches: viewport_experiments
https://developer.blender.org/rB5c31594ab77ca75c95fff6f651c75e4b7075ce4d

Merge branch 'master' into viewport_experiments

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



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

diff --cc source/blender/gpu/CMakeLists.txt
index c1691f6,63eea94..c4b15a4
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@@ -61,9 -63,8 +65,10 @@@ set(SR
  	GPU_material.h
  	GPU_simple_shader.h
  	GPU_select.h
 +	GPU_compositing.h
 +        GPU_renderer.h
  	intern/gpu_codegen.h
+ 	intern/gpu_extensions_private.h
  )
  
  data_to_c_simple(shaders/gpu_shader_material.glsl SRC)
diff --cc source/blender/gpu/intern/gpu_extensions.c
index 254efb4,04f8e68..c6270b8
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@@ -47,9 -47,10 +47,11 @@@
  
  #include "GPU_draw.h"
  #include "GPU_extensions.h"
 +#include "GPU_compositing.h"
  #include "GPU_simple_shader.h"
- #include "gpu_codegen.h"
+ 
+ #include "intern/gpu_codegen.h"
+ #include "intern/gpu_extensions_private.h"
  
  #include <stdlib.h>
  #include <stdio.h>