Merge branch 'master' into blender2.8
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 12 Aug 2017 12:01:17 +0000 (14:01 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sat, 12 Aug 2017 12:01:54 +0000 (14:01 +0200)
commitf1a14740bafc83bfd86774db4dfca2cbe8568cdc
tree1336864f6683880ad3834e7c590ee892ddb0fb9a
parent673c9dce0850f2e6a13570ade132024c34bdb11c
parent60ab0b841827457fe0f8a321afca5bbc8ea9ff50
Merge branch 'master' into blender2.8
source/blender/editors/space_view3d/view3d_draw_legacy.c
source/blender/gpu/GPU_lamp.h
source/blender/gpu/intern/gpu_lamp.c
source/blender/gpu/intern/gpu_material.c