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

[Nick Wu]

Commit: 4498126016926cf89f426499d691d4c1490d17ca
Author: Nick Wu
Date:   Fri Sep 7 23:13:23 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB4498126016926cf89f426499d691d4c1490d17ca

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

# Conflicts:
#	source/blender/draw/CMakeLists.txt
#	source/blender/makesrna/intern/rna_scene.c

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



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

diff --cc source/blender/draw/CMakeLists.txt
index 106e0653536,b9881162e9a..80551ef7e29
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -157,9 -151,8 +157,10 @@@ set(SR
  	engines/eevee/eevee_lut.h
  	engines/eevee/eevee_private.h
  	engines/external/external_engine.h
- 
+ 	engines/workbench/workbench_engine.h
+ 	engines/workbench/workbench_private.h
 +	engines/lanpr/lanpr_util.h
 +	engines/lanpr/lanpr_all.h
  )
  
  data_to_c_simple(engines/eevee/shaders/ambient_occlusion_lib.glsl SRC)
diff --cc source/blender/makesrna/intern/rna_scene.c
index fca178eb6bf,e451c87aa3a..27039e1134a
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@@ -2829,11 -2775,10 +2829,11 @@@ static void rna_def_curve_paint_setting
  	RNA_def_property_ui_text(prop, "Depth", "Method of projecting depth");
  
  	static const EnumPropertyItem surface_plane_items[] = {
- 		{CURVE_PAINT_SURFACE_PLANE_NORMAL_VIEW,  "NORMAL_VIEW", 0, "Normal/View", "Draw perpendicular to the surface"},
- 		{CURVE_PAINT_SURFACE_PLANE_NORMAL_SURFACE, "NORMAL_SURFACE", 0, "Normal/Surface", "Draw aligned to the surface"},
- 		{CURVE_PAINT_SURFACE_PLANE_VIEW, "VIEW", 0, "View", "Draw aligned to the viewport"},
+ 		{CURVE_PAINT_SURFACE_PLANE_NORMAL_VIEW,  "NORMAL_VIEW", 0, "Normal/View", "Display perpendicular to the surface"},
+ 		{CURVE_PAINT_SURFACE_PLANE_NORMAL_SURFACE, "NORMAL_SURFACE", 0, "Normal/Surface", "Display aligned to the surface"},
+ 		{CURVE_PAINT_SURFACE_PLANE_VIEW, "VIEW", 0, "View", "Display aligned to the viewport"},
 -		{0, NULL, 0, NULL, NULL}};
 +		{0, NULL, 0, NULL, NULL}
 +	};
  
  	prop = RNA_def_property(srna, "surface_plane", PROP_ENUM, PROP_NONE);
  	RNA_def_property_enum_sdna(prop, NULL, "surface_plane");