Merge branch 'blender2.7'
authorCampbell Barton <ideasman42@gmail.com>
Fri, 1 Feb 2019 22:37:50 +0000 (09:37 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 1 Feb 2019 22:37:50 +0000 (09:37 +1100)
commita3bf8da8758fb4640feaa3eba5c21161c58b9659
tree96fef05db3006836f5a163716d1b0e6daff6e968
parent9a63fa21eb45038ce747748156da61b14213d6c7
parent81159e99b819910b72cb3caba6b3cd4f35184ea9
Merge branch 'blender2.7'
intern/cycles/render/image.cpp
intern/cycles/render/image.h