Bastien Montagne 322b1d3187 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/animation/anim_draw.c

2017-02-17 20:03:55 +01:00

..

bl_operators

Render Layers and Collections (merge from render-layers)

2017-02-07 11:11:00 +01:00

bl_ui

Merge branch 'master' into blender2.8

2017-02-17 20:03:55 +01:00

keyingsets_builtins.py

Fixes for pose library change 601ce6a89c

2016-09-28 15:40:22 +02:00

nodeitems_builtins.py

Add 'Layer Weight' node to Blender internal node items

2017-01-17 12:02:05 +03:00