[Bf-blender-cvs] [6a65fc34565] blender2.8: Merge branch 'master' into blender2.8

[Bastien Montagne]

Commit: 6a65fc34565da167d686d0ea14f11f73f909d19d
Author: Bastien Montagne
Date:   Wed Jan 24 12:14:59 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB6a65fc34565da167d686d0ea14f11f73f909d19d

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/modifiers/intern/MOD_wireframe.c

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



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

diff --cc source/blender/modifiers/intern/MOD_wireframe.c
index 6fc1907ba0a,15f8b185a3d..3cb35286114
--- a/source/blender/modifiers/intern/MOD_wireframe.c
+++ b/source/blender/modifiers/intern/MOD_wireframe.c
@@@ -132,8 -126,9 +127,8 @@@ ModifierTypeInfo modifierType_Wirefram
  	/* initData */          initData,
  	/* requiredDataMask */  requiredDataMask,
  	/* freeData */          NULL,
- 	/* isDisabled */        isDisabled,
- 	/* updateDepsgraph */   NULL,
+ 	/* isDisabled */        NULL,
+ 	/* updateDepgraph */    NULL,
 -	/* updateDepsgraph */   NULL,
  	/* dependsOnTime */     NULL,
  	/* dependsOnNormals */  dependsOnNormals,
  	/* foreachObjectLink */ NULL,