[Bf-blender-cvs] [007738c] soc-2014-viewport_context: Merge branch 'master' into soc-2014-viewport_context

[Jason Wilkins]

Commit: 007738cddcd2825e367b43faad0254f6625958d4
Author: Jason Wilkins
Date:   Thu Jul 24 02:17:18 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rB007738cddcd2825e367b43faad0254f6625958d4

Merge branch 'master' into soc-2014-viewport_context

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



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

diff --cc source/blender/editors/armature/CMakeLists.txt
index fc211f0,9aa17f1..8c71fd8
--- a/source/blender/editors/armature/CMakeLists.txt
+++ b/source/blender/editors/armature/CMakeLists.txt
@@@ -27,8 -26,8 +27,9 @@@ set(IN
  	../../makesdna
  	../../makesrna
  	../../windowmanager
+ 	../../gpu
  	../../../../intern/guardedalloc
 +	../../../../intern/glew-mx
  )
  
  set(INC_SYS
diff --cc source/blender/gpu/CMakeLists.txt
index 81eadbd,13e46bc..7d97019
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@@ -50,16 -49,16 +50,18 @@@ set(SR
  	intern/gpu_codegen.c
  	intern/gpu_draw.c
  	intern/gpu_extensions.c
 +	intern/gpu_init_exit.c
  	intern/gpu_material.c
  	intern/gpu_simple_shader.c
+ 	intern/gpu_select.c
  
  	GPU_buffers.h
  	GPU_draw.h
  	GPU_extensions.h
 +	GPU_init_exit.h
  	GPU_material.h
  	GPU_simple_shader.h
+ 	GPU_select.h
  	intern/gpu_codegen.h
  )