Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 11 Dec 2018 02:10:56 +0000 (13:10 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 11 Dec 2018 02:10:56 +0000 (13:10 +1100)
commit65b930af39bd3c89a2aed97d238c669d8788a892
tree9d1f312b91772f561977603a89627beb3c32cf65
parent9a8b6d51c129aec9385b83391745ce4ac38e953b
parent908b6d8be3c08157bf30e482e6fa848d728eb1ed
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/camera.c
source/blender/makesrna/intern/rna_camera.c