Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Tue, 20 Nov 2018 09:46:36 +0000 (10:46 +0100)
committerSybren A. Stüvel <sybren@stuvel.eu>
Tue, 20 Nov 2018 09:46:36 +0000 (10:46 +0100)
commit789a259d71745b0f99e511add36b09ea69883ef5
tree2533d23925bf9c14df29dd9a00bc59cf724630bc
parentf8f5751dac6ea2d5f1c8ee9bb6ef247cad5d6119
parent9bc2570e2ac7e3fc5e6095af300ef863d3ba4ca6
Merge branch 'master' into blender2.8
source/blender/makesrna/intern/rna_movieclip.c