Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 24 Jan 2018 11:14:59 +0000 (12:14 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 24 Jan 2018 11:14:59 +0000 (12:14 +0100)
Conflicts:
source/blender/modifiers/intern/MOD_wireframe.c

1  2 
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/modifiers/intern/MOD_wireframe.c
source/blender/nodes/shader/nodes/node_shader_bump.c
source/blender/render/intern/source/pipeline.c

index 6fc1907ba0ae6cd34f9733a8e2a411f5956803e8,15f8b185a3d2ddc1ba04d70285ea934b76a65bf2..3cb35286114b7e44827167485da982c218a7d45f
@@@ -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,