[Bf-blender-cvs] [94f3cf23ec8] hair_guides hair_guides_grooming: Merge branch 'blender2.8' into hair_guides

[Lukas Tönne]

Commit: 94f3cf23ec8c8ab173b04e036d91f375bdcb544a
Author: Lukas Tönne
Date:   Thu Jun 21 18:56:13 2018 +0100
Branches: hair_guides hair_guides_grooming
https://developer.blender.org/rB94f3cf23ec8c8ab173b04e036d91f375bdcb544a

Merge branch 'blender2.8' into hair_guides

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



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

diff --cc source/blender/blenkernel/CMakeLists.txt
index b303d7e4d5f,94d762214f2..9e7d7d6c143
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -276,9 -273,9 +277,10 @@@ set(SR
  	BKE_mball.h
  	BKE_mball_tessellate.h
  	BKE_mesh.h
+ 	BKE_mesh_iterators.h
  	BKE_mesh_mapping.h
  	BKE_mesh_remap.h
 +	BKE_mesh_sample.h
  	BKE_mesh_tangent.h
  	BKE_modifier.h
  	BKE_movieclip.h
diff --cc source/blender/draw/engines/workbench/workbench_materials.c
index 31188fd2edf,c0857cf74aa..0f58924f993
--- a/source/blender/draw/engines/workbench/workbench_materials.c
+++ b/source/blender/draw/engines/workbench/workbench_materials.c
@@@ -91,18 -91,21 +91,29 @@@ char *workbench_material_build_defines(
  	if (NORMAL_ENCODING_ENABLED()) {
  		BLI_dynstr_appendf(ds, "#define WORKBENCH_ENCODE_NORMALS\n");
  	}
 -	if (is_hair) {
 -		BLI_dynstr_appendf(ds, "#define HAIR_SHADER\n");
 +
 +	switch (hair_type) {
 +		case DRW_SHADER_HAIR_NONE:
 +			break;
 +		case DRW_SHADER_HAIR_PARTICLES:
 +			BLI_dynstr_appendf(ds, "#define HAIR_SHADER\n");
 +			break;
 +		case DRW_SHADER_HAIR_FIBERS:
 +			BLI_dynstr_append(ds, DRW_hair_shader_defines());
 +			break;
  	}
  
+ #if STUDIOLIGHT_SPHERICAL_HARMONICS_LEVEL == 0
+ 	BLI_dynstr_appendf(ds, "#define STUDIOLIGHT_SPHERICAL_HARMONICS_LEVEL 0\n");
+ #endif
+ #if STUDIOLIGHT_SPHERICAL_HARMONICS_LEVEL == 1
+ 	BLI_dynstr_appendf(ds, "#define STUDIOLIGHT_SPHERICAL_HARMONICS_LEVEL 1\n");
+ #endif
+ #if STUDIOLIGHT_SPHERICAL_HARMONICS_LEVEL == 2
+ 	BLI_dynstr_appendf(ds, "#define STUDIOLIGHT_SPHERICAL_HARMONICS_LEVEL 2\n");
+ #endif
+ 	BLI_dynstr_appendf(ds, "#define STUDIOLIGHT_SPHERICAL_HARMONICS_MAX_COMPONENTS 9\n");
+ 
  	str = BLI_dynstr_get_cstring(ds);
  	BLI_dynstr_free(ds);
  	return str;
diff --cc source/blender/editors/object/object_ops.c
index 3e3ad9631ca,89dd54b6f64..9061717e04a
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@@ -247,7 -247,10 +247,11 @@@ void ED_operatortypes_object(void
  	WM_operatortype_append(OBJECT_OT_data_transfer);
  	WM_operatortype_append(OBJECT_OT_datalayout_transfer);
  	WM_operatortype_append(OBJECT_OT_surfacedeform_bind);
 +	WM_operatortype_append(OBJECT_OT_fur_generate_follicles);
+ 
+ 	WM_operatortype_append(OBJECT_OT_hide_view_clear);
+ 	WM_operatortype_append(OBJECT_OT_hide_view_set);
+ 	WM_operatortype_append(OBJECT_OT_hide_collection);
  }
  
  void ED_operatormacros_object(void)
diff --cc source/blender/makesrna/intern/rna_modifier.c
index 59816fbdc9b,1e548339e33..2199cf6be39
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -291,8 -285,8 +290,9 @@@ const EnumPropertyItem rna_enum_axis_fl
  
  #include "BKE_cachefile.h"
  #include "BKE_context.h"
 +#include "BKE_hair.h"
  #include "BKE_library.h"
+ #include "BKE_mesh_runtime.h"
  #include "BKE_modifier.h"
  #include "BKE_object.h"
  #include "BKE_particle.h"