Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 14 Aug 2017 15:07:30 +0000 (17:07 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 14 Aug 2017 15:07:30 +0000 (17:07 +0200)
commit3ab46f42046854e1f4c036a9b779177136017772
tree9d0b1414feb32b955a4282d9f7117893d2811e99
parent230be97284de444e6b2566f535141ca31647f6ab
parent3cd51c0379638045cd32c9aa74215032d7bc381b
Merge branch 'master' into blender2.8
release/scripts/startup/bl_operators/clip.py
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/node.c