Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 15 Nov 2018 15:28:37 +0000 (16:28 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 15 Nov 2018 15:28:37 +0000 (16:28 +0100)
commit61ee2f0db8ed5ff19f74dd06fb3a3a77f9636ee6
tree84b9b47cf21d378d14cba1e191e2e8f0777a1edc
parent2aa0a69015f4734a0bd6316418af8021b574cd79
parent74fdf68a413fe9fb6345903fa682ca1a46be3060
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/lamp.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/texture.c
source/blender/blenkernel/intern/world.c