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

[Antony Riakiotakis]

Commit: 54670647770a2536059fe4dd8a37e8bf9ee62d4e
Author: Antony Riakiotakis
Date:   Fri Nov 28 16:15:13 2014 +0100
Branches: viewport_experiments
https://developer.blender.org/rB54670647770a2536059fe4dd8a37e8bf9ee62d4e

Merge branch 'master' into viewport_experiments

Conflicts:
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/gpu/GPU_buffers.h
	source/blender/gpu/intern/gpu_buffers.c

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



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

diff --cc SConstruct
index 845b0b8,4c2097f..bdfa9dc
--- a/SConstruct
+++ b/SConstruct
@@@ -757,13 -757,9 +757,14 @@@ if B.targets != ['cudakernels']
      data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_frag.glsl")
      data_to_c_simple("source/blender/gpu/shaders/gpu_shader_sep_gaussian_blur_vert.glsl")
      data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex.glsl")
+     data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vertex_world.glsl")
      data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_frag.glsl")
      data_to_c_simple("source/blender/gpu/shaders/gpu_shader_vsm_store_vert.glsl")
 +    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fx_ssao_frag.glsl")
 +    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fx_dof_frag.glsl")
 +    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fx_dof_vert.glsl")
 +    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fx_lib.glsl")
 +    data_to_c_simple("source/blender/gpu/shaders/gpu_shader_fx_vert.glsl")
      data_to_c_simple("intern/opencolorio/gpu_shader_display_transform.glsl")
  
      # --- blender ---
diff --cc source/blender/gpu/CMakeLists.txt
index 92841e4,361c247..ca11a3c
--- a/source/blender/gpu/CMakeLists.txt
+++ b/source/blender/gpu/CMakeLists.txt
@@@ -91,13 -73,9 +91,14 @@@ data_to_c_simple(shaders/gpu_shader_sep
  data_to_c_simple(shaders/gpu_shader_simple_frag.glsl SRC)
  data_to_c_simple(shaders/gpu_shader_simple_vert.glsl SRC)
  data_to_c_simple(shaders/gpu_shader_vertex.glsl SRC)
+ data_to_c_simple(shaders/gpu_shader_vertex_world.glsl SRC)
  data_to_c_simple(shaders/gpu_shader_vsm_store_frag.glsl SRC)
  data_to_c_simple(shaders/gpu_shader_vsm_store_vert.glsl SRC)
 +data_to_c_simple(shaders/gpu_shader_fx_vert.glsl SRC)
 +data_to_c_simple(shaders/gpu_shader_fx_ssao_frag.glsl SRC)
 +data_to_c_simple(shaders/gpu_shader_fx_dof_frag.glsl SRC)
 +data_to_c_simple(shaders/gpu_shader_fx_dof_vert.glsl SRC)
 +data_to_c_simple(shaders/gpu_shader_fx_lib.glsl SRC)
  
  if(WITH_GAMEENGINE)
  	add_definitions(-DWITH_GAMEENGINE)