[Bf-blender-cvs] [171c756f200] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 171c756f2006cf0e839fc9fcdd6b0cadebfe699a
Author: Campbell Barton
Date:   Fri Feb 23 13:10:39 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB171c756f2006cf0e839fc9fcdd6b0cadebfe699a

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/blenkernel/BKE_modifier.h
index ac9c2c50df2,b0917e4f6cd..e1ce58ba69b
--- a/source/blender/blenkernel/BKE_modifier.h
+++ b/source/blender/blenkernel/BKE_modifier.h
@@@ -271,9 -284,10 +271,9 @@@ typedef struct ModifierTypeInfo 
  	 *
  	 * This function is optional.
  	 */
 -	/* TODO(sergey): Remove once we finally switched to the new depsgraph. */
  	void (*updateDepsgraph)(struct ModifierData *md,
- 	                        const ModifierUpdateDepsgraphContext* ctx);
- 
+ 	                        const ModifierUpdateDepsgraphContext *ctx);
 -
++ 
  	/* Should return true if the modifier needs to be recalculated on time
  	 * changes.
  	 *