Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 19 Mar 2019 17:54:17 +0000 (18:54 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Tue, 19 Mar 2019 17:54:17 +0000 (18:54 +0100)
commitfa59c6a3e7d72d57faadcf0795848b4c3b8381d9
treeea668f42028f8cdf5a5968feeed27e8bd99b30fd
parente7f535cd4cf919b7e479d20b8a1b6714f166151d
parent83de13f75aafca7d4e1d58ddd36cca19121aa84f
Merge branch 'blender2.7'
intern/cycles/blender/addon/operators.py
intern/cycles/blender/blender_python.cpp
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_util.h