[Bf-blender-cvs] [625de6ef812] soc-2018-npr: Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

[Nick Wu]

Commit: 625de6ef812288aee46bb4292cd024f9b96cf775
Author: Nick Wu
Date:   Wed Jun 13 14:25:14 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB625de6ef812288aee46bb4292cd024f9b96cf775

Merge remote-tracking branch 'remotes/origin/blender2.8' into soc-2018-npr

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



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

diff --cc source/blender/draw/CMakeLists.txt
index f80f1c0c86f,afb527a07c6..6b247960861
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -147,26 -137,8 +145,12 @@@ set(SR
  	engines/eevee/eevee_lut.h
  	engines/eevee/eevee_private.h
  	engines/external/external_engine.h
 +
 +	#engines/lanpr/NUL_TNS.h
 +	engines/lanpr/NUL_Util.h
 +	engines/lanpr/lanpr_all.h
  )
  
- if(WITH_CLAY_ENGINE)
- 	add_definitions(-DWITH_CLAY_ENGINE)
- endif()
- 
- data_to_c_simple(engines/clay/shaders/clay_frag.glsl SRC)
- data_to_c_simple(engines/clay/shaders/clay_fxaa.glsl SRC)
- data_to_c_simple(engines/clay/shaders/clay_copy.glsl SRC)
- data_to_c_simple(engines/clay/shaders/clay_prepass_frag.glsl SRC)
- data_to_c_simple(engines/clay/shaders/clay_vert.glsl SRC)
- data_to_c_simple(engines/clay/shaders/clay_particle_vert.glsl SRC)
- data_to_c_simple(engines/clay/shaders/clay_particle_strand_frag.glsl SRC)
- data_to_c_simple(engines/clay/shaders/ssao_alchemy.glsl SRC)
- data_to_c_simple(engines/clay/shaders/ssao_groundtruth.glsl SRC)
- 
  data_to_c_simple(engines/eevee/shaders/ambient_occlusion_lib.glsl SRC)
  data_to_c_simple(engines/eevee/shaders/default_frag.glsl SRC)
  data_to_c_simple(engines/eevee/shaders/default_world_frag.glsl SRC)
diff --cc source/blender/draw/intern/draw_manager.c
index 569586f1969,ee876275d9e..a5e84a7ad04
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@@ -76,9 -76,7 +76,8 @@@
  #include "draw_cache_impl.h"
  
  #include "draw_mode_engines.h"
- #include "engines/clay/clay_engine.h"
  #include "engines/eevee/eevee_engine.h"
 +#include "engines/lanpr/lanpr_all.h"
  #include "engines/basic/basic_engine.h"
  #include "engines/workbench/workbench_engine.h"
  #include "engines/external/external_engine.h"
@@@ -2043,12 -2067,9 +2068,9 @@@ void DRW_engine_register(DrawEngineTyp
  
  void DRW_engines_register(void)
  {
- #ifdef WITH_CLAY_ENGINE
- 	RE_engines_register(&DRW_engine_viewport_clay_type);
- #endif
  	RE_engines_register(&DRW_engine_viewport_eevee_type);
  	RE_engines_register(&DRW_engine_viewport_workbench_type);
 -
 +    RE_engines_register(&DRW_engine_viewport_lanpr_type);
  	DRW_engine_register(&draw_engine_workbench_solid);
  	DRW_engine_register(&draw_engine_workbench_transparent);