Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Fri, 1 Sep 2017 09:17:14 +0000 (19:17 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 1 Sep 2017 09:17:14 +0000 (19:17 +1000)
commita5cb23c441bcc39cb581674303617ea3a99a4b1c
tree065152cadac0e01fa753996d9ab8553fc8514b0c
parentc843e848921c2361b69dfaeab9c2984069cb7f3b
parent94b7bf3ec21b02952e994bb10c6e596bdae4720e
Merge branch 'master' into blender2.8
intern/cycles/blender/addon/ui.py
source/blender/makesrna/intern/rna_access.c