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)
1  2 
intern/cycles/render/image.cpp
intern/cycles/render/image.h

Simple merge
Simple merge