Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 14 Mar 2019 18:00:10 +0000 (19:00 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 14 Mar 2019 18:00:10 +0000 (19:00 +0100)
commit81a03e17f759316bb40fa4bd416bc2d8d3131bb6
treefad7b9ab268996ed61acf66c3cb322da726a3f13
parent9d4fd2573531ea841ed0940b3babbe76da2e6d02
parent57b5852bc8b8188e73e2ffd7c05aaa3f409c3025
Merge branch 'blender2.7'
intern/cycles/blender/addon/properties.py
intern/cycles/blender/blender_sync.cpp
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h