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)
commit6a65fc34565da167d686d0ea14f11f73f909d19d
tree22b2cbcc614278faa1d3847aafb4371453b2dcf9
parent752fc35fa15b6bfee0309354ffcbf5c78211e8a6
parente68771fa8760035050f476895ebe791c4857f91b
Merge branch 'master' into blender2.8

Conflicts:
source/blender/modifiers/intern/MOD_wireframe.c
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