Merge branch 'blender2.7'
authorJeroen Bakker <j.bakker@atmind.nl>
Wed, 20 Feb 2019 14:22:23 +0000 (15:22 +0100)
committerJeroen Bakker <j.bakker@atmind.nl>
Wed, 20 Feb 2019 14:22:23 +0000 (15:22 +0100)
commit8a4cdda3737dd72fe1f3daa8759dce199fa87844
tree85282e7cb99fdd2d4bfa96c32beb2118f7ec7dd7
parent9315cc443b1db112ca7507765e64034fdc539177
parent949ab753bb2e2d0f76921ed6d716f074ce863f21
Merge branch 'blender2.7'
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_python.cpp