[Bf-blender-cvs] [507e3e12b62] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

[Antonio Vazquez]

Commit: 507e3e12b6277d58331cd71e7b906556215173ab
Author: Antonio Vazquez
Date:   Fri Feb 9 10:27:55 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB507e3e12b6277d58331cd71e7b906556215173ab

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/modifiers/CMakeLists.txt
index defcdb91741,397a3263e22..7eba682c75b
--- a/source/blender/modifiers/CMakeLists.txt
+++ b/source/blender/modifiers/CMakeLists.txt
@@@ -107,9 -107,7 +107,8 @@@ set(SR
  	intern/MOD_wireframe.c
  
  	MOD_modifiertypes.h
- 	intern/MOD_boolean_util.h
  	intern/MOD_fluidsim_util.h
 +	intern/MOD_gpencil_util.h
  	intern/MOD_meshcache_util.h
  	intern/MOD_util.h
  	intern/MOD_weightvg_util.h