Merge branch 'blender2.7'
authorJeroen Bakker <j.bakker@atmind.nl>
Tue, 19 Feb 2019 07:05:15 +0000 (08:05 +0100)
committerJeroen Bakker <j.bakker@atmind.nl>
Tue, 19 Feb 2019 07:05:15 +0000 (08:05 +0100)
commit84a5abdb311561ef93a0261f563ca728110b4f3e
tree7f1a01cc505ae9e372b462112a75f9dccf92b04f
parenteb4acd50648c072ba14dc6a62703434e84ce7cba
parentecd66f69e7b66e8a6ed9b5f39c7dfe272dfbbbed
Merge branch 'blender2.7'
intern/cycles/blender/addon/properties.py