Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 11 Feb 2019 12:37:45 +0000 (13:37 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 11 Feb 2019 12:37:45 +0000 (13:37 +0100)
commit3f8e26370925c94e07f0bbdd51cddad6601fa125
tree4a26576894a2f5d65fe56c1ea6c5a024a9a62099
parent9ec944bbab7a5ba75a526387f8eab52af7f6405e
parentc10f5d15c25cbc5ee319835c90d5d2a4dda53497
Merge branch 'blender2.7'
intern/cycles/blender/addon/__init__.py
intern/cycles/blender/addon/operators.py
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_device.cpp
intern/cycles/blender/blender_device.h
intern/cycles/blender/blender_python.cpp
intern/cycles/blender/blender_session.cpp
intern/cycles/blender/blender_sync.cpp
intern/cycles/render/session.cpp